diff options
| author | Brandon Low <lostlogic@rockbox.org> | 2006-03-19 01:01:03 +0000 |
|---|---|---|
| committer | Brandon Low <lostlogic@rockbox.org> | 2006-03-19 01:01:03 +0000 |
| commit | 5650b70517e2de03a7ab6b07a1532094a52fe0c3 (patch) | |
| tree | fa1e5ad57a18ac4212ff3b8a2af7b9f917479ae6 | |
| parent | a6fb393507ef2f8d91bd460b621ddcb63439dfbc (diff) | |
| download | rockbox-5650b70517e2de03a7ab6b07a1532094a52fe0c3.zip rockbox-5650b70517e2de03a7ab6b07a1532094a52fe0c3.tar.gz rockbox-5650b70517e2de03a7ab6b07a1532094a52fe0c3.tar.bz2 rockbox-5650b70517e2de03a7ab6b07a1532094a52fe0c3.tar.xz | |
Fix some problems with using USB_POWERED as a charging state separate from charger_inserted
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9109 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/debug_menu.c | 7 | ||||
| -rw-r--r-- | firmware/backlight.c | 15 |
2 files changed, 19 insertions, 3 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 8cf4103..9ab5050 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -31,6 +31,7 @@ #include "adc.h" #include "mas.h" #include "power.h" +#include "usb.h" #include "rtc.h" #include "debug.h" #include "thread.h" @@ -1470,7 +1471,11 @@ static bool view_runtime(void) if (state & 1) { #ifdef HAVE_CHARGING - if (charger_inserted()) + if (charger_inserted() +#ifdef HAVE_USB_POWER + || usb_powered() +#endif + ) { global_settings.runtime = 0; } diff --git a/firmware/backlight.c b/firmware/backlight.c index d7c2295..9d48f0d 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c @@ -409,7 +409,11 @@ static void backlight_tick(void) { #ifdef HAVE_CHARGING static bool charger_was_inserted = false; - bool charger_is_inserted = charger_inserted(); + bool charger_is_inserted = charger_inserted() +#ifdef HAVE_USB_POWER + || usb_powered() +#endif + ; if( charger_was_inserted != charger_is_inserted ) { @@ -483,7 +487,14 @@ void backlight_off(void) int backlight_get_current_timeout(void) { #ifdef HAVE_CHARGING - return charger_inserted() ? backlight_timeout_plugged : backlight_timeout; + if (charger_inserted() +#ifdef HAVE_USB_POWER + || usb_powered() +#endif + ) + return backlight_timeout_plugged; + else + return backlight_timeout; #else return backlight_timeout; #endif |