summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@rockbox.org>2006-03-19 01:01:03 +0000
committerBrandon Low <lostlogic@rockbox.org>2006-03-19 01:01:03 +0000
commit5650b70517e2de03a7ab6b07a1532094a52fe0c3 (patch)
treefa1e5ad57a18ac4212ff3b8a2af7b9f917479ae6 /apps
parenta6fb393507ef2f8d91bd460b621ddcb63439dfbc (diff)
downloadrockbox-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
Diffstat (limited to 'apps')
-rw-r--r--apps/debug_menu.c7
1 files changed, 6 insertions, 1 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 }