summaryrefslogtreecommitdiffstats
path: root/firmware/powermgmt.c
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2012-03-15 14:58:15 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2012-03-15 15:01:11 +0100
commita4fd5bf7cb3d8d071c5fb9d45255c8f85e517b7a (patch)
tree5c35337c12a983e7155f517aac6c1496225ef849 /firmware/powermgmt.c
parent5edae54e0d11e810040380aace455af7ec7c8d08 (diff)
downloadrockbox-a4fd5bf7cb3d8d071c5fb9d45255c8f85e517b7a.tar.gz
rockbox-a4fd5bf7cb3d8d071c5fb9d45255c8f85e517b7a.tar.bz2
rockbox-a4fd5bf7cb3d8d071c5fb9d45255c8f85e517b7a.zip
imx233: enable charging in bootloader USB mode by including powermgmt
Change-Id: I8b91b3ab60cb9ffaa127333e9bcef8c33be742fa
Diffstat (limited to 'firmware/powermgmt.c')
-rw-r--r--firmware/powermgmt.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index b31dc81624..379b91ca13 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -889,9 +889,9 @@ void set_keypress_restarts_sleep_timer(bool enable)
sleeptimer_key_restarts = enable;
}
+#ifndef BOOTLOADER
static void handle_sleep_timer(void)
{
-#ifndef BOOTLOADER
if (!sleeptimer_active)
return;
@@ -912,8 +912,8 @@ static void handle_sleep_timer(void)
sys_poweroff();
}
}
-#endif /* BOOTLOADER */
}
+#endif /* BOOTLOADER */
/*
* We shut off in the following cases:
@@ -929,6 +929,7 @@ static void handle_sleep_timer(void)
*/
void handle_auto_poweroff(void)
{
+#ifndef BOOTLOADER
long timeout = poweroff_timeout*60*HZ;
int audio_stat = audio_status();
long tick = current_tick;
@@ -968,4 +969,5 @@ void handle_auto_poweroff(void)
}
} else
handle_sleep_timer();
+#endif
}