Skip to content

Fix checking of TARGET_* symbols #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2014
Merged

Fix checking of TARGET_* symbols #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions libraries/rtos/rtx/RTX_CM_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions libraries/rtos/rtx/RTX_Conf_CM.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions libraries/tests/mbed/ticker_2/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);


Expand Down
6 changes: 3 additions & 3 deletions libraries/tests/mbed/time_us/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions libraries/tests/mbed/timeout/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down