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/powermgmt.c | |
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/powermgmt.c')
-rw-r--r-- | firmware/powermgmt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index f1dd83ef52..c5f981d1f6 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #endif | 44 | #endif |
45 | #include "logf.h" | 45 | #include "logf.h" |
46 | #include "lcd-remote.h" | 46 | #include "lcd-remote.h" |
47 | #ifdef SIMULATOR | 47 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) |
48 | #include <time.h> | 48 | #include <time.h> |
49 | #endif | 49 | #endif |
50 | 50 | ||
@@ -73,7 +73,7 @@ enum charge_state_type charge_state = DISCHARGING; | |||
73 | #endif | 73 | #endif |
74 | #endif /* CONFIG_CHARGING */ | 74 | #endif /* CONFIG_CHARGING */ |
75 | 75 | ||
76 | #ifndef SIMULATOR | 76 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
77 | static int shutdown_timeout = 0; | 77 | static int shutdown_timeout = 0; |
78 | /* | 78 | /* |
79 | * Average battery voltage and charger voltage, filtered via a digital | 79 | * Average battery voltage and charger voltage, filtered via a digital |
@@ -830,7 +830,7 @@ void cancel_shutdown(void) | |||
830 | 830 | ||
831 | shutdown_timeout = 0; | 831 | shutdown_timeout = 0; |
832 | } | 832 | } |
833 | #endif /* SIMULATOR */ | 833 | #endif /* PLATFORM_NATIVE */ |
834 | 834 | ||
835 | /* Send system battery level update events on reaching certain significant | 835 | /* Send system battery level update events on reaching certain significant |
836 | levels. This must be called after battery_percent has been updated. */ | 836 | levels. This must be called after battery_percent has been updated. */ |