nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Thomas Jarosch 2011-03-01 21:19:30 +00:00
parent ef99e33bc5
commit c9e00806d4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/powermgmt.c
View File

@ -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;
}