Skip to content

Commit 882ceb8

Browse files
committed
Merge pull request #204 from fatih-asici/master
Fix checking of TARGET_* symbols
2 parents 423ddcb + 4a0b789 commit 882ceb8

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

libraries/rtos/rtx/RTX_CM_lib.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,25 +202,25 @@ osThreadDef_t os_thread_def_main = {(os_pthread)main, osPriorityNormal, 0, NULL}
202202
#ifdef TARGET_LPC1768
203203
#define INITIAL_SP (0x10008000UL)
204204

205-
#elif TARGET_LPC11U24
205+
#elif defined(TARGET_LPC11U24)
206206
#define INITIAL_SP (0x10002000UL)
207207

208-
#elif TARGET_LPC11U35_401
208+
#elif defined(TARGET_LPC11U35_401)
209209
#define INITIAL_SP (0x10002000UL)
210210

211-
#elif TARGET_LPC1114
211+
#elif defined(TARGET_LPC1114)
212212
#define INITIAL_SP (0x10001000UL)
213213

214-
#elif TARGET_LPC812
214+
#elif defined(TARGET_LPC812)
215215
#define INITIAL_SP (0x10001000UL)
216216

217-
#elif TARGET_KL25Z
217+
#elif defined(TARGET_KL25Z)
218218
#define INITIAL_SP (0x20003000UL)
219219

220-
#elif TARGET_LPC4088
220+
#elif defined(TARGET_LPC4088)
221221
#define INITIAL_SP (0x10010000UL)
222222

223-
#elif TARGET_LPC1347
223+
#elif defined(TARGET_LPC1347)
224224
#define INITIAL_SP (0x10002000UL)
225225

226226
#endif

libraries/rtos/rtx/RTX_Conf_CM.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#ifndef OS_TASKCNT
5252
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC1347)
5353
# define OS_TASKCNT 14
54-
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || (TARGET_LPC1114) || (TARGET_LPC812) || defined(TARGET_KL25Z)
54+
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC1114) || defined(TARGET_LPC812) || defined(TARGET_KL25Z)
5555
# define OS_TASKCNT 6
5656
# endif
5757
#endif
@@ -60,7 +60,7 @@
6060
#ifndef OS_SCHEDULERSTKSIZE
6161
# if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC1347)
6262
# define OS_SCHEDULERSTKSIZE 256
63-
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || (TARGET_LPC1114) || (TARGET_LPC812) || defined(TARGET_KL25Z)
63+
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC1114) || defined(TARGET_LPC812) || defined(TARGET_KL25Z)
6464
# define OS_SCHEDULERSTKSIZE 128
6565
# endif
6666
#endif
@@ -107,7 +107,7 @@
107107
# elif defined(TARGET_LPC1347)
108108
# define OS_CLOCK 72000000
109109

110-
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || (TARGET_LPC1114) || defined(TARGET_KL25Z)
110+
# elif defined(TARGET_LPC11U24) || defined(TARGET_LPC11U35_401) || defined(TARGET_LPC1114) || defined(TARGET_KL25Z)
111111
# define OS_CLOCK 48000000
112112
#
113113
# elif defined(TARGET_LPC812)

libraries/tests/mbed/ticker_2/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ DigitalOut led(LED1);
55
#ifdef TARGET_KL25Z
66
DigitalOut out(PTA1);
77

8-
#elif TARGET_LPC812
8+
#elif defined(TARGET_LPC812)
99
DigitalOut out(D10);
1010

11-
#elif TARGET_KL05Z
11+
#elif defined(TARGET_KL05Z)
1212
DigitalOut out(PTB1);
1313

14-
#elif TARGET_KL46Z
14+
#elif defined(TARGET_KL46Z)
1515
DigitalOut out(PTA1);
1616

1717

libraries/tests/mbed/time_us/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
#ifdef TARGET_KL25Z
44
DigitalOut out(PTD4);
55

6-
#elif TARGET_KL05Z
6+
#elif defined(TARGET_KL05Z)
77
DigitalOut out(PTB1);
88

9-
#elif TARGET_KL46Z
9+
#elif defined(TARGET_KL46Z)
1010
DigitalOut out(PTA1);
1111

12-
#elif TARGET_LPC812
12+
#elif defined(TARGET_LPC812)
1313
DigitalOut out(D10);
1414

1515
#else

libraries/tests/mbed/timeout/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ DigitalOut led(LED1);
55
#ifdef TARGET_KL25Z
66
DigitalOut out(PTA1);
77

8-
#elif TARGET_KL05Z
8+
#elif defined(TARGET_KL05Z)
99
DigitalOut out(PTB1);
1010

11-
#elif TARGET_KL46Z
11+
#elif defined(TARGET_KL46Z)
1212
DigitalOut out(PTA1);
1313

1414
#elif defined(TARGET_LPC812)

0 commit comments

Comments
 (0)