diff options
| author | Thomas Jarosch <tomj@simonv.com> | 2011-03-01 21:19:30 +0000 |
|---|---|---|
| committer | Thomas Jarosch <tomj@simonv.com> | 2011-03-01 21:19:30 +0000 |
| commit | c9e00806d47d7be96f0b308ca52edcb2d20e6aff (patch) | |
| tree | 195c61f85053e879210efa09e7f90d9d8952591d /firmware/powermgmt.c | |
| parent | ef99e33bc57d9f0d70507eb3e1b491cd0597320d (diff) | |
| download | rockbox-c9e00806d47d7be96f0b308ca52edcb2d20e6aff.tar.gz rockbox-c9e00806d47d7be96f0b308ca52edcb2d20e6aff.zip | |
Fix red - 2nd try. Use same ifdef style as in firmware/drivers/pcf50606.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29487 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/powermgmt.c')
| -rw-r--r-- | firmware/powermgmt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index db37a5df0b..4c265d132b 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c @@ -765,7 +765,7 @@ void sys_poweroff(void) /* If the main thread fails to shut down the system, we will force a power off after an 20 second timeout - 28 seconds if recording */ if (shutdown_timeout == 0) { -#if defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2) +#if (defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2)) && !defined(SIMULATOR) pcf50606_reset_timeout(); /* Reset timer on first attempt only */ #endif #ifdef HAVE_RECORDING @@ -788,13 +788,11 @@ void cancel_shutdown(void) { logf("cancel_shutdown()"); -#ifndef BOOTLOADER -#if defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2) +#if (defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2)) && !defined(SIMULATOR) /* TODO: Move some things to target/ tree */ if (shutdown_timeout) pcf50606_reset_timeout(); #endif -#endif /* BOOTLOADER */ shutdown_timeout = 0; } |