TEAMUSB / mbed-rtos

mbed-rtos // fixed error.h

Dependents:   USBHost

Fork of mbed-rtos by mbed official

Files at this revision

API Documentation at this revision

Revision 17:771275db0efe, committed 2014-03-10

Comitter:
mbed_official
Date:
Mon Mar 10 11:45:09 2014 +0000
Parent:
16:f88660a9bed1
Child:
18:710466f5cf33
Commit message:
Synchronized with git revision 882ceb80ee8119f98c4cf31e06a91925eddaca91

Full URL: https://github.com/mbedmicro/mbed/commit/882ceb80ee8119f98c4cf31e06a91925eddaca91/

Fix checking of TARGET_* symbols

Changed in this revision

rtx/RTX_CM_lib.h Show annotated file Show diff for this revision Revisions of this file
rtx/RTX_Conf_CM.c Show annotated file Show diff for this revision Revisions of this file 
--- a/rtx/RTX_CM_lib.h	Thu Jan 23 17:30:07 2014 +0000
+++ b/rtx/RTX_CM_lib.h	Mon Mar 10 11:45:09 2014 +0000
@@ -202,25 +202,25 @@
 #ifdef TARGET_LPC1768
 #define INITIAL_SP            (0x10008000UL)
 
-#elif TARGET_LPC11U24
+#elif defined(TARGET_LPC11U24)
 #define INITIAL_SP            (0x10002000UL)
 
-#elif TARGET_LPC11U35_401
+#elif defined(TARGET_LPC11U35_401)
 #define INITIAL_SP            (0x10002000UL)
 
-#elif TARGET_LPC1114
+#elif defined(TARGET_LPC1114)
 #define INITIAL_SP            (0x10001000UL)
 
-#elif TARGET_LPC812
+#elif defined(TARGET_LPC812)
 #define INITIAL_SP            (0x10001000UL)
 
-#elif TARGET_KL25Z
+#elif defined(TARGET_KL25Z)
 #define INITIAL_SP            (0x20003000UL)
 
-#elif TARGET_LPC4088
+#elif defined(TARGET_LPC4088)
 #define INITIAL_SP            (0x10010000UL)
 
-#elif TARGET_LPC1347
+#elif defined(TARGET_LPC1347)
 #define INITIAL_SP            (0x10002000UL)
 
 #endif

--- a/rtx/RTX_Conf_CM.c	Thu Jan 23 17:30:07 2014 +0000
+++ b/rtx/RTX_Conf_CM.c	Mon Mar 10 11:45:09 2014 +0000
@@ -51,7 +51,7 @@
 #ifndef OS_TASKCNT
 #  if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC1347)
 #    define OS_TASKCNT         14
-#  elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || (TARGET_LPC1114) || (TARGET_LPC812) || defined(TARGET_KL25Z)
+#  elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC1114) || defined(TARGET_LPC812) || defined(TARGET_KL25Z)
 #    define OS_TASKCNT         6
 #  endif
 #endif
@@ -60,7 +60,7 @@
 #ifndef OS_SCHEDULERSTKSIZE
 #  if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC1347)
 #      define OS_SCHEDULERSTKSIZE    256
-#  elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || (TARGET_LPC1114) || (TARGET_LPC812) || defined(TARGET_KL25Z)
+#  elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC1114) || defined(TARGET_LPC812) || defined(TARGET_KL25Z)
 #      define OS_SCHEDULERSTKSIZE    128
 #  endif
 #endif
@@ -107,7 +107,7 @@
 #  elif defined(TARGET_LPC1347)
 #    define OS_CLOCK       72000000
 
-#  elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || (TARGET_LPC1114) || defined(TARGET_KL25Z)
+#  elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC1114) || defined(TARGET_KL25Z)
 #    define OS_CLOCK       48000000
 #
 #  elif defined(TARGET_LPC812)