Added battery charger code for the recorder and battery voltage statistics keeping for all platforms.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1546 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 17 insertions, 4 deletions

diff --git a/firmware/drivers/adc.h b/firmware/drivers/adc.h
index 1ff5118238..0c05f4d0f8 100644
--- a/firmware/drivers/adc.h
+++ b/firmware/drivers/adc.h
@@ -40,6 +40,8 @@
 #define BATTERY_SCALE_FACTOR 6546
 #endif
 
+#define EXT_SCALE_FACTOR 14800
+
 unsigned short adc_read(int channel);
 void adc_init(void);
 
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index d3ce939ce2..559509fa67 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -22,12 +22,16 @@
 #include "adc.h"
 #include "power.h"
 
+#ifdef HAVE_CHARGE_CTRL
+bool charger_enabled = 0;
+#endif
+
 #ifndef SIMULATOR
 
 bool charger_inserted(void)
 {
 #ifdef ARCHOS_RECORDER
-    return adc_read(ADC_EXT_POWER) > 0x200;
+    return adc_read(ADC_EXT_POWER) > 0x100;
 #else
     return (PADR & 1) == 0;
 #endif
@@ -58,11 +62,14 @@ bool battery_level_safe(void)
 
 void charger_enable(bool on)
 {
-#ifdef ARCHOS_RECORDER
-    if(on)
+#ifdef HAVE_CHARGE_CTRL
+    if(on) {
         PBDR &= ~0x20;
-    else
+        charger_enabled = 1;
+    } else {
         PBDR |= 0x20;
+        charger_enabled = 0;
+    }
 #else
     on = on;
 #endif
diff --git a/firmware/drivers/power.h b/firmware/drivers/power.h
index f921b67d5e..fe7d443bef 100644
--- a/firmware/drivers/power.h
+++ b/firmware/drivers/power.h
@@ -26,6 +26,10 @@
 
 #define BATTERY_RANGE (BATTERY_LEVEL_FULL - BATTERY_LEVEL_EMPTY)
 
+#ifdef HAVE_CHARGE_CTRL
+extern bool charger_enabled;
+#endif
+
 bool charger_inserted(void);
 void charger_enable(bool on);
 void ide_power_enable(bool on);