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

1 files changed, 13 insertions, 2 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index d7c22956fb..9d48f0d660 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