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/drivers | |
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/drivers')
-rw-r--r-- | firmware/drivers/button.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 16c0d2c16a..171acaaded 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "serial.h" | 33 | #include "serial.h" |
34 | #include "power.h" | 34 | #include "power.h" |
35 | #include "powermgmt.h" | 35 | #include "powermgmt.h" |
36 | #ifdef SIMULATOR | 36 | #ifdef HAVE_SDL |
37 | #include "button-sdl.h" | 37 | #include "button-sdl.h" |
38 | #else | 38 | #else |
39 | #include "button-target.h" | 39 | #include "button-target.h" |
@@ -215,7 +215,7 @@ static void button_tick(void) | |||
215 | 215 | ||
216 | /* Safety net for players without hardware | 216 | /* Safety net for players without hardware |
217 | poweroff */ | 217 | poweroff */ |
218 | #ifndef SIMULATOR | 218 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
219 | if(repeat_count > POWEROFF_COUNT * 10) | 219 | if(repeat_count > POWEROFF_COUNT * 10) |
220 | power_off(); | 220 | power_off(); |
221 | #endif | 221 | #endif |
@@ -440,7 +440,7 @@ static int button_flip(int button) | |||
440 | { | 440 | { |
441 | int newbutton = button; | 441 | int newbutton = button; |
442 | 442 | ||
443 | #ifndef SIMULATOR | 443 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
444 | newbutton &= | 444 | newbutton &= |
445 | ~(BUTTON_LEFT | BUTTON_RIGHT | 445 | ~(BUTTON_LEFT | BUTTON_RIGHT |
446 | #if defined(BUTTON_UP) && defined(BUTTON_DOWN) | 446 | #if defined(BUTTON_UP) && defined(BUTTON_DOWN) |