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/common | |
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/common')
-rw-r--r-- | firmware/common/dircache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c index f8365e1137..0a58175d53 100644 --- a/firmware/common/dircache.c +++ b/firmware/common/dircache.c | |||
@@ -171,7 +171,7 @@ static bool check_event_queue(void) | |||
171 | return false; | 171 | return false; |
172 | } | 172 | } |
173 | 173 | ||
174 | #ifndef SIMULATOR | 174 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
175 | /* scan and build static data (avoid redundancy on stack) */ | 175 | /* scan and build static data (avoid redundancy on stack) */ |
176 | static struct | 176 | static struct |
177 | { | 177 | { |
@@ -301,7 +301,7 @@ static int dircache_scan_and_build(IF_MV2(int volume,) struct dircache_entry *ce | |||
301 | 301 | ||
302 | return sab_process_dir(0, ce); | 302 | return sab_process_dir(0, ce); |
303 | } | 303 | } |
304 | #else /* !SIMULATOR */ | 304 | #elif (CONFIG_PLATFORM & PLATFORM_HOSTED) /* PLATFORM_HOSTED */ |
305 | static char sab_path[MAX_PATH]; | 305 | static char sab_path[MAX_PATH]; |
306 | 306 | ||
307 | static int sab_process_dir(struct dircache_entry *ce) | 307 | static int sab_process_dir(struct dircache_entry *ce) |
@@ -400,7 +400,7 @@ static int dircache_scan_and_build(IF_MV2(int volume,) struct dircache_entry *ce | |||
400 | strlcpy(sab_path, "/", sizeof sab_path); | 400 | strlcpy(sab_path, "/", sizeof sab_path); |
401 | return sab_process_dir(ce); | 401 | return sab_process_dir(ce); |
402 | } | 402 | } |
403 | #endif /* SIMULATOR */ | 403 | #endif /* PLATFORM_NATIVE */ |
404 | 404 | ||
405 | /** | 405 | /** |
406 | * Internal function to get a pointer to dircache_entry for a given filename. | 406 | * Internal function to get a pointer to dircache_entry for a given filename. |
@@ -689,7 +689,7 @@ static void dircache_thread(void) | |||
689 | dircache_initialized = false; | 689 | dircache_initialized = false; |
690 | break ; | 690 | break ; |
691 | 691 | ||
692 | #ifndef SIMULATOR | 692 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
693 | case SYS_USB_CONNECTED: | 693 | case SYS_USB_CONNECTED: |
694 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | 694 | usb_acknowledge(SYS_USB_CONNECTED_ACK); |
695 | usb_wait_for_disconnect(&dircache_queue); | 695 | usb_wait_for_disconnect(&dircache_queue); |