From 4a0b7893ecd05d906da13b93fa8db82c13a194c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Sat, 8 Mar 2014 23:26:09 +0200 Subject: [PATCH] Fix checking of TARGET_* symbols --- libraries/rtos/rtx/RTX_CM_lib.h | 14 +++++++------- libraries/rtos/rtx/RTX_Conf_CM.c | 6 +++--- libraries/tests/mbed/ticker_2/main.cpp | 6 +++--- libraries/tests/mbed/time_us/main.cpp | 6 +++--- libraries/tests/mbed/timeout/main.cpp | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libraries/rtos/rtx/RTX_CM_lib.h b/libraries/rtos/rtx/RTX_CM_lib.h index d6771b8eca..266ca829a1 100644 --- a/libraries/rtos/rtx/RTX_CM_lib.h +++ b/libraries/rtos/rtx/RTX_CM_lib.h @@ -202,25 +202,25 @@ osThreadDef_t os_thread_def_main = {(os_pthread)main, osPriorityNormal, 0, NULL} #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 diff --git a/libraries/rtos/rtx/RTX_Conf_CM.c b/libraries/rtos/rtx/RTX_Conf_CM.c index c1117c6c48..cfb6197f5e 100644 --- a/libraries/rtos/rtx/RTX_Conf_CM.c +++ b/libraries/rtos/rtx/RTX_Conf_CM.c @@ -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) diff --git a/libraries/tests/mbed/ticker_2/main.cpp b/libraries/tests/mbed/ticker_2/main.cpp index 6d7e569673..24f3e7546a 100644 --- a/libraries/tests/mbed/ticker_2/main.cpp +++ b/libraries/tests/mbed/ticker_2/main.cpp @@ -5,13 +5,13 @@ DigitalOut led(LED1); #ifdef TARGET_KL25Z DigitalOut out(PTA1); -#elif TARGET_LPC812 +#elif defined(TARGET_LPC812) DigitalOut out(D10); -#elif TARGET_KL05Z +#elif defined(TARGET_KL05Z) DigitalOut out(PTB1); -#elif TARGET_KL46Z +#elif defined(TARGET_KL46Z) DigitalOut out(PTA1); diff --git a/libraries/tests/mbed/time_us/main.cpp b/libraries/tests/mbed/time_us/main.cpp index 549ae26d9d..4a6038139b 100644 --- a/libraries/tests/mbed/time_us/main.cpp +++ b/libraries/tests/mbed/time_us/main.cpp @@ -3,13 +3,13 @@ #ifdef TARGET_KL25Z DigitalOut out(PTD4); -#elif TARGET_KL05Z +#elif defined(TARGET_KL05Z) DigitalOut out(PTB1); -#elif TARGET_KL46Z +#elif defined(TARGET_KL46Z) DigitalOut out(PTA1); -#elif TARGET_LPC812 +#elif defined(TARGET_LPC812) DigitalOut out(D10); #else diff --git a/libraries/tests/mbed/timeout/main.cpp b/libraries/tests/mbed/timeout/main.cpp index a496f0c502..ab9f99614e 100644 --- a/libraries/tests/mbed/timeout/main.cpp +++ b/libraries/tests/mbed/timeout/main.cpp @@ -5,10 +5,10 @@ DigitalOut led(LED1); #ifdef TARGET_KL25Z DigitalOut out(PTA1); -#elif TARGET_KL05Z +#elif defined(TARGET_KL05Z) DigitalOut out(PTB1); -#elif TARGET_KL46Z +#elif defined(TARGET_KL46Z) DigitalOut out(PTA1); #elif defined(TARGET_LPC812)