From a258fe1887bf3213bffa07e96f1ec3871fbb9c31 Mon Sep 17 00:00:00 2001
From: Linus Nielsen Feltzing <linus@haxx.se>
Date: Thu, 5 Feb 2004 13:44:04 +0000
Subject: Better charging feedback for FM/V2 devices

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4296 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/drivers/power.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'firmware/drivers/power.c')

diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index 83300fe1d4..563ff3e25c 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -45,8 +45,9 @@ bool charger_inserted(void)
     return adc_read(ADC_EXT_POWER) > 0x100;
 #else
 #ifdef HAVE_FMADC
-    /* FM */
-    return adc_read(ADC_CHARGE_REGULATOR) < 0x1FF;
+    /* FM or V2, can also charge from the USB port */
+    return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF) ||
+        (adc_read(ADC_USB_POWER) < 0x1FF);
 #else
     /* Player */
     return (PADR & 1) == 0;
-- 
cgit v1.2.3