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.tar.gz rockbox-5650b70517e2de03a7ab6b07a1532094a52fe0c3.zip |
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 8cf41037f1..9ab505061e 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "adc.h" | 31 | #include "adc.h" |
32 | #include "mas.h" | 32 | #include "mas.h" |
33 | #include "power.h" | 33 | #include "power.h" |
34 | #include "usb.h" | ||
34 | #include "rtc.h" | 35 | #include "rtc.h" |
35 | #include "debug.h" | 36 | #include "debug.h" |
36 | #include "thread.h" | 37 | #include "thread.h" |
@@ -1470,7 +1471,11 @@ static bool view_runtime(void) | |||
1470 | 1471 | ||
1471 | if (state & 1) { | 1472 | if (state & 1) { |
1472 | #ifdef HAVE_CHARGING | 1473 | #ifdef HAVE_CHARGING |
1473 | if (charger_inserted()) | 1474 | if (charger_inserted() |
1475 | #ifdef HAVE_USB_POWER | ||
1476 | || usb_powered() | ||
1477 | #endif | ||
1478 | ) | ||
1474 | { | 1479 | { |
1475 | global_settings.runtime = 0; | 1480 | global_settings.runtime = 0; |
1476 | } | 1481 | } |
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) | |||
409 | { | 409 | { |
410 | #ifdef HAVE_CHARGING | 410 | #ifdef HAVE_CHARGING |
411 | static bool charger_was_inserted = false; | 411 | static bool charger_was_inserted = false; |
412 | bool charger_is_inserted = charger_inserted(); | 412 | bool charger_is_inserted = charger_inserted() |
413 | #ifdef HAVE_USB_POWER | ||
414 | || usb_powered() | ||
415 | #endif | ||
416 | ; | ||
413 | 417 | ||
414 | if( charger_was_inserted != charger_is_inserted ) | 418 | if( charger_was_inserted != charger_is_inserted ) |
415 | { | 419 | { |
@@ -483,7 +487,14 @@ void backlight_off(void) | |||
483 | int backlight_get_current_timeout(void) | 487 | int backlight_get_current_timeout(void) |
484 | { | 488 | { |
485 | #ifdef HAVE_CHARGING | 489 | #ifdef HAVE_CHARGING |
486 | return charger_inserted() ? backlight_timeout_plugged : backlight_timeout; | 490 | if (charger_inserted() |
491 | #ifdef HAVE_USB_POWER | ||
492 | || usb_powered() | ||
493 | #endif | ||
494 | ) | ||
495 | return backlight_timeout_plugged; | ||
496 | else | ||
497 | return backlight_timeout; | ||
487 | #else | 498 | #else |
488 | return backlight_timeout; | 499 | return backlight_timeout; |
489 | #endif | 500 | #endif |