diff options
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) | |||
765 | /* If the main thread fails to shut down the system, we will force a | 765 | /* If the main thread fails to shut down the system, we will force a |
766 | power off after an 20 second timeout - 28 seconds if recording */ | 766 | power off after an 20 second timeout - 28 seconds if recording */ |
767 | if (shutdown_timeout == 0) { | 767 | if (shutdown_timeout == 0) { |
768 | #if defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2) | 768 | #if (defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2)) && !defined(SIMULATOR) |
769 | pcf50606_reset_timeout(); /* Reset timer on first attempt only */ | 769 | pcf50606_reset_timeout(); /* Reset timer on first attempt only */ |
770 | #endif | 770 | #endif |
771 | #ifdef HAVE_RECORDING | 771 | #ifdef HAVE_RECORDING |
@@ -788,13 +788,11 @@ void cancel_shutdown(void) | |||
788 | { | 788 | { |
789 | logf("cancel_shutdown()"); | 789 | logf("cancel_shutdown()"); |
790 | 790 | ||
791 | #ifndef BOOTLOADER | 791 | #if (defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2)) && !defined(SIMULATOR) |
792 | #if defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2) | ||
793 | /* TODO: Move some things to target/ tree */ | 792 | /* TODO: Move some things to target/ tree */ |
794 | if (shutdown_timeout) | 793 | if (shutdown_timeout) |
795 | pcf50606_reset_timeout(); | 794 | pcf50606_reset_timeout(); |
796 | #endif | 795 | #endif |
797 | #endif /* BOOTLOADER */ | ||
798 | 796 | ||
799 | shutdown_timeout = 0; | 797 | shutdown_timeout = 0; |
800 | } | 798 | } |