diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2012-03-15 14:58:15 +0100 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2012-03-15 15:01:11 +0100 |
| commit | a4fd5bf7cb3d8d071c5fb9d45255c8f85e517b7a (patch) | |
| tree | 5c35337c12a983e7155f517aac6c1496225ef849 /firmware | |
| parent | 5edae54e0d11e810040380aace455af7ec7c8d08 (diff) | |
| download | rockbox-a4fd5bf7cb3d8d071c5fb9d45255c8f85e517b7a.zip rockbox-a4fd5bf7cb3d8d071c5fb9d45255c8f85e517b7a.tar.gz rockbox-a4fd5bf7cb3d8d071c5fb9d45255c8f85e517b7a.tar.bz2 rockbox-a4fd5bf7cb3d8d071c5fb9d45255c8f85e517b7a.tar.xz | |
imx233: enable charging in bootloader USB mode by including powermgmt
Change-Id: I8b91b3ab60cb9ffaa127333e9bcef8c33be742fa
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/SOURCES | 2 | ||||
| -rw-r--r-- | firmware/powermgmt.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 9b0f83d..a791cbb 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1335,9 +1335,9 @@ target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c target/arm/imx233/sansa-fuzeplus/power-fuzeplus.c target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c +target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c #ifndef BOOTLOADER target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c -target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c #endif #endif diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index b31dc81..379b91c 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 } |