diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-06-21 16:53:00 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-06-21 16:53:00 +0000 |
commit | 35e8b1429a2cdcf6580f6d25890fed9865165d0b (patch) | |
tree | 084be19a29bffa879eee8e3cad92d8f3b342a337 /firmware/SOURCES | |
parent | 02e04585bdf1fbd00cf84d2000f59ec198440cb3 (diff) | |
download | rockbox-35e8b1429a2cdcf6580f6d25890fed9865165d0b.tar.gz rockbox-35e8b1429a2cdcf6580f6d25890fed9865165d0b.zip |
Rockbox as an application: Replace many occurences of #ifdef SIMULATOR with #if (CONFIG_PLATFORM & PLATFORM_HOSTED) (or equivalently).
The simulator defines PLATFORM_HOSTED, as RaaA will do (RaaA will not define SIMULATOR).
The new define is to (de-)select code to compile on hosted platforms generally.
Should be no functional change to targets or the simulator.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27019 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/SOURCES')
-rw-r--r-- | firmware/SOURCES | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index c95946dd0d..bef2b772ad 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -10,7 +10,7 @@ usb.c | |||
10 | logf.c | 10 | logf.c |
11 | #endif /* ROCKBOX_HAS_LOGF */ | 11 | #endif /* ROCKBOX_HAS_LOGF */ |
12 | kernel.c | 12 | kernel.c |
13 | #ifndef SIMULATOR | 13 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
14 | #ifdef RB_PROFILE | 14 | #ifdef RB_PROFILE |
15 | profile.c | 15 | profile.c |
16 | #endif /* RB_PROFILE */ | 16 | #endif /* RB_PROFILE */ |
@@ -19,7 +19,7 @@ rolo.c | |||
19 | #endif /* !defined(BOOTLOADER) || defined(CPU_SH) */ | 19 | #endif /* !defined(BOOTLOADER) || defined(CPU_SH) */ |
20 | thread.c | 20 | thread.c |
21 | timer.c | 21 | timer.c |
22 | #endif /* SIMULATOR */ | 22 | #endif /* PLATFORM_NATIVE */ |
23 | #ifdef HAVE_SDL | 23 | #ifdef HAVE_SDL |
24 | target/hosted/sdl/button-sdl.c | 24 | target/hosted/sdl/button-sdl.c |
25 | target/hosted/sdl/kernel-sdl.c | 25 | target/hosted/sdl/kernel-sdl.c |
@@ -40,13 +40,13 @@ panic.c | |||
40 | debug.c | 40 | debug.c |
41 | 41 | ||
42 | /* Standard library */ | 42 | /* Standard library */ |
43 | #if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) | 43 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(__MINGW32__) || defined(__CYGWIN__) |
44 | libc/errno.c | 44 | libc/errno.c |
45 | libc/strtok.c | 45 | libc/strtok.c |
46 | /* alsa on linux requires a more advanced sprintf, i.e. not ours */ | 46 | /* alsa on linux requires a more advanced sprintf, i.e. not ours */ |
47 | libc/sprintf.c | 47 | libc/sprintf.c |
48 | #endif /* !SIMULATOR || __MINGW32__ || __CYGWIN__ */ | 48 | #endif /* PLATFORM_NATIVE || __MINGW32__ || __CYGWIN__ */ |
49 | #if !defined(SIMULATOR) | 49 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
50 | libc/atoi.c | 50 | libc/atoi.c |
51 | libc/ctype.c | 51 | libc/ctype.c |
52 | libc/memcmp.c | 52 | libc/memcmp.c |
@@ -70,11 +70,11 @@ common/crc32.c | |||
70 | #ifdef MI4_FORMAT | 70 | #ifdef MI4_FORMAT |
71 | common/crc32-mi4.c | 71 | common/crc32-mi4.c |
72 | #endif | 72 | #endif |
73 | #ifndef SIMULATOR | 73 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
74 | common/dir_uncached.c | 74 | common/dir_uncached.c |
75 | common/file.c | 75 | common/file.c |
76 | common/disk.c | 76 | common/disk.c |
77 | #endif /* SIMULATOR */ | 77 | #endif /* PLATFORM_NATIVE */ |
78 | #ifdef HAVE_DIRCACHE | 78 | #ifdef HAVE_DIRCACHE |
79 | common/dircache.c | 79 | common/dircache.c |
80 | #endif /* HAVE_DIRCACHE */ | 80 | #endif /* HAVE_DIRCACHE */ |
@@ -143,21 +143,21 @@ backlight-sw-fading.c | |||
143 | /* Misc. */ | 143 | /* Misc. */ |
144 | drivers/led.c | 144 | drivers/led.c |
145 | drivers/button.c | 145 | drivers/button.c |
146 | #ifndef SIMULATOR | 146 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
147 | #ifdef HAVE_DAC3550A | 147 | #ifdef HAVE_DAC3550A |
148 | drivers/dac.c | 148 | drivers/dac.c |
149 | #endif | 149 | #endif |
150 | #ifdef HAVE_SERIAL | 150 | #ifdef HAVE_SERIAL |
151 | drivers/serial.c | 151 | drivers/serial.c |
152 | #endif | 152 | #endif |
153 | #endif /* SIMULATOR */ | 153 | #endif /* PLATFORM_NATIVE */ |
154 | #ifdef HAVE_TOUCHSCREEN | 154 | #ifdef HAVE_TOUCHSCREEN |
155 | drivers/touchscreen.c | 155 | drivers/touchscreen.c |
156 | #endif | 156 | #endif |
157 | 157 | ||
158 | 158 | ||
159 | /* Storage */ | 159 | /* Storage */ |
160 | #ifndef SIMULATOR | 160 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
161 | #if (CONFIG_STORAGE & STORAGE_MMC) | 161 | #if (CONFIG_STORAGE & STORAGE_MMC) |
162 | drivers/ata_mmc.c | 162 | drivers/ata_mmc.c |
163 | #endif | 163 | #endif |
@@ -184,7 +184,7 @@ drivers/fat.c | |||
184 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) | 184 | #if (CONFIG_STORAGE & STORAGE_MMC) || (CONFIG_STORAGE & STORAGE_SD) |
185 | sdmmc.c | 185 | sdmmc.c |
186 | #endif | 186 | #endif |
187 | #endif /* SIMULATOR */ | 187 | #endif /* PLATFORM_NATIVE */ |
188 | 188 | ||
189 | /* EEPROM */ | 189 | /* EEPROM */ |
190 | #ifdef HAVE_EEPROM | 190 | #ifdef HAVE_EEPROM |
@@ -195,7 +195,7 @@ eeprom_settings.c | |||
195 | #endif /* HAVE_EEPROM */ | 195 | #endif /* HAVE_EEPROM */ |
196 | 196 | ||
197 | /* RTC */ | 197 | /* RTC */ |
198 | #ifndef SIMULATOR | 198 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
199 | #if (CONFIG_RTC == RTC_M41ST84W) | 199 | #if (CONFIG_RTC == RTC_M41ST84W) |
200 | drivers/rtc/rtc_m41st84w.c | 200 | drivers/rtc/rtc_m41st84w.c |
201 | #elif (CONFIG_RTC == RTC_PCF50606) | 201 | #elif (CONFIG_RTC == RTC_PCF50606) |
@@ -225,13 +225,13 @@ drivers/rtc/rtc_s35390a.c | |||
225 | #elif (CONFIG_RTC == RTC_D2) | 225 | #elif (CONFIG_RTC == RTC_D2) |
226 | drivers/rtc/rtc_d2.c | 226 | drivers/rtc/rtc_d2.c |
227 | #endif /* (CONFIG_RTC == RTC_) */ | 227 | #endif /* (CONFIG_RTC == RTC_) */ |
228 | #endif /* SIMULATOR */ | 228 | #endif /* PLATFORM_NATIVE */ |
229 | 229 | ||
230 | #ifndef BOOTLOADER | 230 | #ifndef BOOTLOADER |
231 | /* Tuner */ | 231 | /* Tuner */ |
232 | #if CONFIG_TUNER | 232 | #if CONFIG_TUNER |
233 | tuner.c | 233 | tuner.c |
234 | #ifndef SIMULATOR | 234 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
235 | #if (CONFIG_TUNER & LV24020LP) | 235 | #if (CONFIG_TUNER & LV24020LP) |
236 | drivers/tuner/lv24020lp.c | 236 | drivers/tuner/lv24020lp.c |
237 | #endif /* (CONFIG_TUNER & LV24020LP) */ | 237 | #endif /* (CONFIG_TUNER & LV24020LP) */ |
@@ -254,7 +254,7 @@ drivers/tuner/ipod_remote_tuner.c | |||
254 | #if (CONFIG_TUNER & RDA5802) | 254 | #if (CONFIG_TUNER & RDA5802) |
255 | drivers/tuner/rda5802.c | 255 | drivers/tuner/rda5802.c |
256 | #endif /* (CONFIG_TUNER & RDA5802) */ | 256 | #endif /* (CONFIG_TUNER & RDA5802) */ |
257 | #endif /*SIMULATOR */ | 257 | #endif /* PLATFORM_NATIVE */ |
258 | #endif /* CONFIG_TUNER */ | 258 | #endif /* CONFIG_TUNER */ |
259 | #endif /* BOOTLOADER */ | 259 | #endif /* BOOTLOADER */ |
260 | 260 | ||
@@ -285,7 +285,7 @@ drivers/mas.c | |||
285 | #endif /* SWCODEC */ | 285 | #endif /* SWCODEC */ |
286 | 286 | ||
287 | /* Audio codec */ | 287 | /* Audio codec */ |
288 | #if !defined(SIMULATOR) && !defined(BOOTLOADER) | 288 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER) |
289 | #if defined(HAVE_UDA1380) | 289 | #if defined(HAVE_UDA1380) |
290 | drivers/audio/uda1380.c | 290 | drivers/audio/uda1380.c |
291 | #elif defined(HAVE_WM8751) \ | 291 | #elif defined(HAVE_WM8751) \ |
@@ -319,7 +319,7 @@ drivers/audio/sdl.c | |||
319 | #if CONFIG_CODEC == SWCODEC | 319 | #if CONFIG_CODEC == SWCODEC |
320 | target/hosted/sdl/pcm-sdl.c | 320 | target/hosted/sdl/pcm-sdl.c |
321 | #endif | 321 | #endif |
322 | #endif /* !defined(SIMULATOR) && !defined(BOOTLOADER) */ | 322 | #endif /* (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER) */ |
323 | 323 | ||
324 | /* USB Stack */ | 324 | /* USB Stack */ |
325 | #if !defined(SIMULATOR) | 325 | #if !defined(SIMULATOR) |
@@ -531,10 +531,10 @@ libc/memmove.c | |||
531 | libc/memset.c | 531 | libc/memset.c |
532 | common/memset16.c | 532 | common/memset16.c |
533 | libc/strlen.c | 533 | libc/strlen.c |
534 | #ifndef SIMULATOR | 534 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
535 | crt0.S | 535 | crt0.S |
536 | drivers/i2c.c | 536 | drivers/i2c.c |
537 | #endif /* SIMULATOR */ | 537 | #endif /* PLATFORM_NATIVE */ |
538 | 538 | ||
539 | #endif /* defined(CPU_*) */ | 539 | #endif /* defined(CPU_*) */ |
540 | 540 | ||