Diff: capi/semihost_api.c

Revision:

2:143cac498751

Parent:

0:fd0d7bdfcdc2

--- a/capi/semihost_api.c	Thu Nov 29 15:41:14 2012 +0000
+++ b/capi/semihost_api.c	Mon Feb 18 11:44:18 2013 +0000
@@ -1,23 +1,17 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2006-2012 ARM Limited
+ * Copyright (c) 2006-2013 ARM Limited
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 #include "cmsis.h"
 #include "semihost_api.h"
@@ -25,6 +19,8 @@
 #include <stdint.h>
 #include <string.h>
 
+#if DEVICE_SEMIHOST
+
 // ARM Semihosting Commands
 #define SYS_OPEN   (0x1)
 #define SYS_CLOSE  (0x2)
@@ -39,7 +35,7 @@
 #define SYS_EXIT   (0x18)
 
 // mbed Semihosting Commands
-#define RESERVED_FOR_USER_APPLICATIONS (0x100) // 0x100 - 0x1ff 
+#define RESERVED_FOR_USER_APPLICATIONS (0x100) // 0x100 - 0x1ff
 #define USR_XFFIND      (RESERVED_FOR_USER_APPLICATIONS + 0)
 #define USR_UID      (RESERVED_FOR_USER_APPLICATIONS + 1)
 #define USR_RESET     (RESERVED_FOR_USER_APPLICATIONS + 2)
@@ -61,19 +57,21 @@
 }
 
 int semihost_write(FILEHANDLE fh, const unsigned char* buffer, unsigned int length, int mode) {
+    if (length == 0) return 0;
+
     uint32_t args[3];
     args[0] = (uint32_t)fh;
     args[1] = (uint32_t)buffer;
-    args[2] = (uint32_t)length; 
+    args[2] = (uint32_t)length;
     return __semihost(SYS_WRITE, args);
-} 
+}
 
 int semihost_read(FILEHANDLE fh, unsigned char* buffer, unsigned int length, int mode) {
     uint32_t args[3];
     args[0] = (uint32_t)fh;
     args[1] = (uint32_t)buffer;
-    args[2] = (uint32_t)length; 
-    return __semihost(SYS_READ, args); 
+    args[2] = (uint32_t)length;
+    return __semihost(SYS_READ, args);
 }
 
 int semihost_istty(FILEHANDLE fh) {
@@ -91,7 +89,7 @@
     return __semihost(SYS_ENSURE, &fh);
 }
 
-long semihost_flen(FILEHANDLE fh) { 
+long semihost_flen(FILEHANDLE fh) {
     return __semihost(SYS_FLEN, &fh);
 }
 
@@ -120,7 +118,7 @@
 int semihost_uid(char *uid) {
     uint32_t args[2];
     args[0] = (uint32_t)uid;
-    args[1] = 33;
+    args[1] = DEVICE_ID_LENGTH + 1;
     return __semihost(USR_UID, &args);
 }
 
@@ -154,3 +152,5 @@
     return __semihost(USR_DISABLEDEBUG, NULL);
 }
 
+#endif
+