18 files changed, 96 insertions, 271 deletions

diff --git a/firmware/target/arm/archos/av300/power-av300.c b/firmware/target/arm/archos/av300/power-av300.c
index 5aa757d3e6..013fd04691 100644
--- a/firmware/target/arm/archos/av300/power-av300.c
+++ b/firmware/target/arm/archos/av300/power-av300.c
@@ -32,16 +32,14 @@
 #include "system.h"
 #include "power.h"
 
-#ifndef SIMULATOR
-
 void power_init(void)
 {
     /* Charger detect */
 }
 
-bool charger_inserted(void)
-{     
-    return false;
+unsigned int power_input_status(void)
+{
+    return POWER_INPUT_NONE;
 }
 
 void ide_power_enable(bool on)
@@ -61,29 +59,6 @@ void power_off(void)
 {
 }
 
-#else
-
-bool charger_inserted(void)
-{
-    return false;
-}
-
-void charger_enable(bool on)
-{
-    (void)on;
-}
-
-void power_off(void)
-{
-}
-
-void ide_power_enable(bool on)
-{
-   (void)on;
-}
-
-#endif /* SIMULATOR */
-
 bool tuner_power(bool status)
 {
     (void)status;
diff --git a/firmware/target/arm/as3525/power-as3525.c b/firmware/target/arm/as3525/power-as3525.c
index a61cb59c12..07867546c2 100644
--- a/firmware/target/arm/as3525/power-as3525.c
+++ b/firmware/target/arm/as3525/power-as3525.c
@@ -18,7 +18,6 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-
 #include <stdbool.h>
 #include "config.h"
 #include "ascodec-target.h"
@@ -40,14 +39,14 @@ void power_init(void)
 }
 
 #if CONFIG_CHARGING
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-    if(ascodec_read(AS3514_IRQ_ENRD0) & (1<<5))
-        return true;
-    else
-        return false;
+    return (ascodec_read(AS3514_IRQ_ENRD0) & (1<<5)) ?
+        POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE;
+
+    /* TODO: Handle USB and other sources properly */
 }
-#endif
+#endif /* CONFIG_CHARGING */
 
 void ide_power_enable(bool on)
 {
diff --git a/firmware/target/arm/imx31/gigabeat-s/power-imx31.c b/firmware/target/arm/imx31/gigabeat-s/power-imx31.c
index 9d9cc6bcb6..62f9982dd5 100644
--- a/firmware/target/arm/imx31/gigabeat-s/power-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/power-imx31.c
@@ -27,8 +27,6 @@
 #include "avic-imx31.h"
 #include "mc13783.h"
 
-#ifndef SIMULATOR
-
 static bool charger_detect = false;
 
 /* This is called from the mc13783 interrupt thread */
@@ -38,9 +36,17 @@ void charger_detect_event(void)
         mc13783_read(MC13783_INTERRUPT_SENSE0) & MC13783_CHGDETS;
 }
 
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-    return charger_detect;
+    unsigned int status = POWER_INPUT_NONE;
+
+    if ((GPIO3_DR & (1 << 20)) != 0)
+        status |= POWER_INPUT_BATTERY;
+
+    if (charger_detect)
+        status |= POWER_INPUT_MAIN_CHARGER;
+
+    return status;
 }
 
 /* Returns true if the unit is charging the batteries. */
@@ -90,26 +96,3 @@ void power_init(void)
     mc13783_enable_event(MC13783_CHGDET_EVENT);
 }
 
-#else /* SIMULATOR */
-
-bool charger_inserted(void)
-{
-    return false;
-}
-
-void charger_enable(bool on)
-{
-    (void)on;
-}
-
-void power_off(void)
-{
-}
-
-void ide_power_enable(bool on)
-{
-   (void)on;
-}
-
-#endif /* SIMULATOR */
-
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c
index af1ac9fc87..cb93fe398f 100644
--- a/firmware/target/arm/ipod/power-ipod.c
+++ b/firmware/target/arm/ipod/power-ipod.c
@@ -43,18 +43,28 @@ void power_init(void)
 }
 
 #if CONFIG_CHARGING
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-#if defined(IPOD_VIDEO)
-    return (GPIOL_INPUT_VAL & 0x08)?false:true;
+    unsigned int status = POWER_INPUT_NONE;
+
+#if defined(IPOD_NANO) || defined(IPOD_VIDEO)
+    if ((GPIOL_INPUT_VAL & 0x08) == 0)
+        status = POWER_INPUT_MAIN_CHARGER;
+
+    if ((GPIOL_INPUT_VAL & 0x10) != 0)
+        status |= POWER_INPUT_USB_CHARGER;
+    /* */
 #elif defined(IPOD_4G) || defined(IPOD_COLOR) \
        || defined(IPOD_MINI) || defined(IPOD_MINI2G)
     /* C2 is firewire power */
-    return (GPIOC_INPUT_VAL & 0x04)?false:true; 
+    if ((GPIOC_INPUT_VAL & 0x04) == 0)
+        status = POWER_INPUT_MAIN_CHARGER;
+    /* */
 #else
     /* This needs filling in for other ipods. */
-    return false;
 #endif
+
+    return status;
 }
 
 /* Returns true if the unit is charging the batteries. */
diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c
index dd09387889..deca3258e2 100644
--- a/firmware/target/arm/iriver/h10/power-h10.c
+++ b/firmware/target/arm/iriver/h10/power-h10.c
@@ -52,9 +52,11 @@ void power_init(void)
 {
 }
 
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-    return (GPIOF_INPUT_VAL & 0x08)?true:false;
+    /* No separate source for USB and charges from USB on its own */
+    return (GPIOF_INPUT_VAL & 0x08) ?
+        POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE;
 }
 
 void ide_power_enable(bool on)
diff --git a/firmware/target/arm/olympus/mrobe-100/power-mr100.c b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
index 1ff15c57bf..c3eb96b03c 100644
--- a/firmware/target/arm/olympus/mrobe-100/power-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
@@ -41,9 +41,10 @@ void power_init(void)
     GPIOB_OUTPUT_EN  |=  0x80;
 }
 
-bool charger_inserted(void)
-{     
-    return (GPIOL_INPUT_VAL & 0x24) ? true : false ;
+unsigned int power_input_status(void)
+{
+    return (GPIOL_INPUT_VAL & 0x24) ?
+        POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE;
 }
 
 void ide_power_enable(bool on)
diff --git a/firmware/target/arm/philips/hdd1630/power-hdd1630.c b/firmware/target/arm/philips/hdd1630/power-hdd1630.c
index 91193bae35..ade2536154 100755
--- a/firmware/target/arm/philips/hdd1630/power-hdd1630.c
+++ b/firmware/target/arm/philips/hdd1630/power-hdd1630.c
@@ -37,9 +37,9 @@ void power_init(void)
 {
 }
 
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {     
-    return false ;
+    return POWER_INPUT_NONE;
 }
 
 void ide_power_enable(bool on)
diff --git a/firmware/target/arm/philips/sa9200/power-sa9200.c b/firmware/target/arm/philips/sa9200/power-sa9200.c
index 44df437577..654beee064 100644
--- a/firmware/target/arm/philips/sa9200/power-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/power-sa9200.c
@@ -54,15 +54,9 @@ void power_off(void)
     }
 }
 
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-#ifdef SANSA_E200
-    if(GPIOB_INPUT_VAL & 0x10)
-#else /* SANSA_C200 */
-    if(GPIOH_INPUT_VAL & 0x2)
-#endif
-        return true;
-    return false;
+    return POWER_INPUT_NONE;
 }
 
 void ide_power_enable(bool on)
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
index c1c0595262..ad9098dd8a 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
@@ -27,8 +27,7 @@
 #include "pcf50606.h"
 #include "backlight.h"
 #include "backlight-target.h"
-
-#ifndef SIMULATOR
+#include "usb.h"
 
 void power_init(void)
 {
@@ -39,13 +38,28 @@ void power_init(void)
     /* Charger detect */
 }
 
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-    return (GPFDAT & (1 << 4)) ? false : true;
+    unsigned int status = POWER_INPUT_NONE;
+
+    /* Is the battery switch ON? */
+    if ((GPGDAT & (1 << 9)) == 0)
+        status |= POWER_INPUT_BATTERY;
+
+    /* Main or cradle power available? */
+    if ((GPFDAT & (1 << 4)) == 0)
+        status |= POWER_INPUT_MAIN_CHARGER;
+
+    /* Is the USB cable inserted? */
+    if (usb_detect() == USB_INSERTED)
+        status |= POWER_INPUT_USB_CHARGER;
+
+    return status;
 }
 
 /* Returns true if the unit is charging the batteries. */
-bool charging_state(void) {
+bool charging_state(void)
+{
     return (GPGDAT & (1 << 8)) ? false : true;
 }
 
@@ -87,27 +101,3 @@ void power_off(void)
 
     reboot_point();
 }
-
-#else /* SIMULATOR */
-
-bool charger_inserted(void)
-{
-    return false;
-}
-
-void charger_enable(bool on)
-{
-    (void)on;
-}
-
-void power_off(void)
-{
-}
-
-void ide_power_enable(bool on)
-{
-   (void)on;
-}
-
-#endif /* SIMULATOR */
-
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index d6319f44bb..cc9d16f466 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -26,6 +26,7 @@
 #include "tuner.h"
 #include "as3514.h"
 #include "power.h"
+#include "usb.h"
 
 void power_init(void)
 {
@@ -53,15 +54,24 @@ void power_off(void)
     }
 }
 
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-#ifdef SANSA_E200
-    if(GPIOB_INPUT_VAL & 0x10)
-#else /* SANSA_C200 */
-    if(GPIOH_INPUT_VAL & 0x2)
+    unsigned int status = POWER_INPUT_NONE;
+
+#if defined(SANSA_E200)
+    #define _charger_present() (GPIOB_INPUT_VAL & 0x10)
+#elif defined(SANSA_C200)
+    #define _charger_present() (GPIOH_INPUT_VAL & 0x2)
+#else
+    #define _charger_present() 0
 #endif
-        return true;
-    return false;
+    
+    if (_charger_present())
+        status = POWER_INPUT_MAIN_CHARGER;
+
+    /* No separate source for USB */
+
+    return status;
 }
 
 void ide_power_enable(bool on)
diff --git a/firmware/target/arm/tatung/tpj1022/power-tpj1022.c b/firmware/target/arm/tatung/tpj1022/power-tpj1022.c
index f16d3c9cc2..abf5790702 100644
--- a/firmware/target/arm/tatung/tpj1022/power-tpj1022.c
+++ b/firmware/target/arm/tatung/tpj1022/power-tpj1022.c
@@ -41,9 +41,9 @@ void power_init(void)
 {
 }
 
-bool charger_inserted(void)
-{     
-    return false;
+unsigned int power_input_status(void)
+{
+    return POWER_INPUT_NONE;
 }
 
 void ide_power_enable(bool on)
diff --git a/firmware/target/arm/tcc77x/c100/power-c100.c b/firmware/target/arm/tcc77x/c100/power-c100.c
index 77574ccc87..e84ff1c852 100644
--- a/firmware/target/arm/tcc77x/c100/power-c100.c
+++ b/firmware/target/arm/tcc77x/c100/power-c100.c
@@ -25,8 +25,6 @@
 #include "system.h"
 #include "power.h"
 
-#ifndef SIMULATOR
-
 void power_init(void)
 {
 }
@@ -43,22 +41,3 @@ bool ide_powered(void)
 void power_off(void)
 {
 }
-
-#else /* SIMULATOR */
-
-bool charger_inserted(void)
-{
-    return false;
-}
-
-void charger_enable(bool on)
-{
-    (void)on;
-}
-
-void ide_power_enable(bool on)
-{
-   (void)on;
-}
-
-#endif /* SIMULATOR */
diff --git a/firmware/target/arm/tcc77x/iaudio7/power-iaudio7.c b/firmware/target/arm/tcc77x/iaudio7/power-iaudio7.c
index ce7175ef55..0501ba272c 100644
--- a/firmware/target/arm/tcc77x/iaudio7/power-iaudio7.c
+++ b/firmware/target/arm/tcc77x/iaudio7/power-iaudio7.c
@@ -141,7 +141,8 @@ bool tuner_power(bool status)
 
 #endif /* CONFIG_TUNER */
 
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-    return (GPIOA & 0x1) ? true : false;
+    return (GPIOA & 0x1) ?
+        POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE;
 }
diff --git a/firmware/target/arm/tcc77x/logikdax/power-logikdax.c b/firmware/target/arm/tcc77x/logikdax/power-logikdax.c
index 82eb8dce02..e84ff1c852 100644
--- a/firmware/target/arm/tcc77x/logikdax/power-logikdax.c
+++ b/firmware/target/arm/tcc77x/logikdax/power-logikdax.c
@@ -25,8 +25,6 @@
 #include "system.h"
 #include "power.h"
 
-#ifndef SIMULATOR
-
 void power_init(void)
 {
 }
@@ -43,26 +41,3 @@ bool ide_powered(void)
 void power_off(void)
 {
 }
-
-#else /* SIMULATOR */
-
-bool charger_inserted(void)
-{
-    return false;
-}
-
-void charger_enable(bool on)
-{
-    (void)on;
-}
-
-void power_off(void)
-{
-}
-
-void ide_power_enable(bool on)
-{
-   (void)on;
-}
-
-#endif /* SIMULATOR */
diff --git a/firmware/target/arm/tcc77x/m200/power-m200.c b/firmware/target/arm/tcc77x/m200/power-m200.c
index 82eb8dce02..e84ff1c852 100644
--- a/firmware/target/arm/tcc77x/m200/power-m200.c
+++ b/firmware/target/arm/tcc77x/m200/power-m200.c
@@ -25,8 +25,6 @@
 #include "system.h"
 #include "power.h"
 
-#ifndef SIMULATOR
-
 void power_init(void)
 {
 }
@@ -43,26 +41,3 @@ bool ide_powered(void)
 void power_off(void)
 {
 }
-
-#else /* SIMULATOR */
-
-bool charger_inserted(void)
-{
-    return false;
-}
-
-void charger_enable(bool on)
-{
-    (void)on;
-}
-
-void power_off(void)
-{
-}
-
-void ide_power_enable(bool on)
-{
-   (void)on;
-}
-
-#endif /* SIMULATOR */
diff --git a/firmware/target/arm/tcc780x/cowond2/power-cowond2.c b/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
index 9eb0871c6e..d3f6a1ce16 100644
--- a/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
+++ b/firmware/target/arm/tcc780x/cowond2/power-cowond2.c
@@ -26,8 +26,6 @@
 #include "button-target.h"
 #include "tuner.h"
 
-#ifndef SIMULATOR
-
 void power_init(void)
 {
     unsigned char data[3]; /* 0 = INT1, 1 = INT2, 2 = INT3 */
@@ -93,9 +91,10 @@ void EXT3(void)
 #endif
 
 #if CONFIG_CHARGING
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-    return (GPIOC & (1<<26)) ? false:true;
+    return ((GPIOC & (1<<26)) == 0) ?
+        POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE;
 }
 #endif
 
@@ -147,26 +146,3 @@ bool tuner_power(bool status)
 }
 
 #endif /* CONFIG_TUNER */
-
-#else /* SIMULATOR */
-
-bool charger_inserted(void)
-{
-    return false;
-}
-
-void charger_enable(bool on)
-{
-    (void)on;
-}
-
-void power_off(void)
-{
-}
-
-void ide_power_enable(bool on)
-{
-   (void)on;
-}
-
-#endif /* SIMULATOR */
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c
index a76e827bec..9c0f9c3cb7 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c
@@ -28,8 +28,6 @@
 #include "backlight.h"
 #include "backlight-target.h"
 
-#ifndef SIMULATOR
-
 void power_init(void)
 {
     /* Initialize IDE power pin */
@@ -37,34 +35,17 @@ void power_init(void)
     /* Charger detect */
 }
 
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-    return false;
+    return POWER_INPUT_NONE;
 }
 
 /* Returns true if the unit is charging the batteries. */
-bool charging_state(void) {
-    return false;
-}
-
-void power_off(void)
-{
-}
-
-#else /* SIMULATOR */
-
-bool charger_inserted(void)
+bool charging_state(void)
 {
     return false;
 }
 
-void charger_enable(bool on)
-{
-    (void)on;
-}
-
 void power_off(void)
 {
 }
-
-#endif /* SIMULATOR */
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c
index 7f4a3b31de..8e8531e4ff 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/power-mr500.c
@@ -29,8 +29,6 @@
 #include "backlight.h"
 #include "backlight-target.h"
 
-#ifndef SIMULATOR
-
 void power_init(void)
 {
     /* Initialize IDE power pin */
@@ -40,9 +38,9 @@ void power_init(void)
     /* Charger detect */
 }
 
-bool charger_inserted(void)
+unsigned int power_input_status(void)
 {
-    return false;
+    return POWER_INPUT_NONE;
 }
 
 /* Returns true if the unit is charging the batteries. */
@@ -71,27 +69,3 @@ void power_off(void)
     /* Hard shutdown */
     IO_GIO_BITSET1|=1<<10;
 }
-
-#else /* SIMULATOR */
-
-bool charger_inserted(void)
-{
-    return false;
-}
-
-void charger_enable(bool on)
-{
-    (void)on;
-}
-
-void power_off(void)
-{
-}
-
-void ide_power_enable(bool on)
-{
-   (void)on;
-}
-
-#endif /* SIMULATOR */
-