diff options
| author | Thomas Jarosch <tomj@simonv.com> | 2011-03-01 20:31:20 +0000 |
|---|---|---|
| committer | Thomas Jarosch <tomj@simonv.com> | 2011-03-01 20:31:20 +0000 |
| commit | acd8bffb9576432cb52c6c325da74192a30bae67 (patch) | |
| tree | 0374b5422ae31493abd8060c18178b3b1aec2494 /firmware | |
| parent | 0f68a91bc567083ff8956e5cd68536728888e696 (diff) | |
| download | rockbox-acd8bffb9576432cb52c6c325da74192a30bae67.tar.gz rockbox-acd8bffb9576432cb52c6c325da74192a30bae67.zip | |
Expose sys_poweroff() and cancel_shutdown() to RaaA. Hopefully fixes android build
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29485 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/powermgmt.c | 5 | ||||
| -rw-r--r-- | firmware/target/hosted/maemo/maemo-thread.c | 4 | ||||
| -rw-r--r-- | firmware/target/hosted/sdl/system-sdl.c | 6 |
3 files changed, 3 insertions, 12 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 615b96deae..c856e1be70 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c @@ -76,8 +76,9 @@ enum charge_state_type charge_state = DISCHARGING; #endif #endif /* CONFIG_CHARGING */ -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) static int shutdown_timeout = 0; + +#if (CONFIG_PLATFORM & PLATFORM_NATIVE) /* * Average battery voltage and charger voltage, filtered via a digital * exponential filter (aka. exponential moving average, scaled): @@ -755,6 +756,7 @@ void shutdown_hw(void) sleep(HZ/4); power_off(); } +#endif /* PLATFORM_NATIVE */ void sys_poweroff(void) { @@ -794,7 +796,6 @@ void cancel_shutdown(void) shutdown_timeout = 0; } -#endif /* PLATFORM_NATIVE */ /* Send system battery level update events on reaching certain significant levels. This must be called after battery_percent has been updated. */ diff --git a/firmware/target/hosted/maemo/maemo-thread.c b/firmware/target/hosted/maemo/maemo-thread.c index a0e5824252..8300c8f0b6 100644 --- a/firmware/target/hosted/maemo/maemo-thread.c +++ b/firmware/target/hosted/maemo/maemo-thread.c @@ -210,7 +210,3 @@ void set_poweroff_timeout(int timeout) void reset_poweroff_timer(void) { } - -void cancel_shutdown(void) -{ -} diff --git a/firmware/target/hosted/sdl/system-sdl.c b/firmware/target/hosted/sdl/system-sdl.c index 0b487d0c2b..750a0144a4 100644 --- a/firmware/target/hosted/sdl/system-sdl.c +++ b/firmware/target/hosted/sdl/system-sdl.c @@ -71,12 +71,6 @@ bool debug_audio = false; bool debug_wps = false; int wps_verbose_level = 3; -void sys_poweroff(void) -{ - /* Post SYS_POWEROFF event. Will post SDL_USEREVENT in shutdown_hw() if successful. */ - queue_broadcast(SYS_POWEROFF, 0); -} - /* * This thread will read the buttons in an interrupt like fashion, and * also initializes SDL_INIT_VIDEO and the surfaces |