3 files changed, 11 insertions, 23 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
index d7fe87f168..4540be671a 100644
--- a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
@@ -43,7 +43,7 @@ unsigned int power_input_status(void)
     if (GPIO3_DR & (1 << 20))
         status |= POWER_INPUT_BATTERY;
 
-    if (usb_allowed_current() < 500)
+    if (usb_charging_maxcurrent() < 500)
     {
         /* ACK that USB is connected but NOT chargeable */
         status &= ~(POWER_INPUT_USB_CHARGER & POWER_INPUT_CHARGER);
@@ -52,6 +52,12 @@ unsigned int power_input_status(void)
     return status;
 }
 
+void usb_charging_maxcurrent_change(int maxcurrent)
+{
+    (void)maxcurrent;
+    /* Nothing to do */
+}
+
 /* Detect changes in presence of the AC adaptor. */
 void charger_main_detect_event(void)
 {
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c
index 5164f0fa1a..a75cb39729 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c
@@ -54,15 +54,10 @@ void power_init(void)
 #if CONFIG_CHARGING
 
 #ifdef HAVE_USB_CHARGING_ENABLE
-bool usb_charging_enable(bool on)
+void usb_charging_maxcurrent_change(int maxcurrent)
 {
+    bool on = (maxcurrent >= 500);
     PDAT11 = (PDAT11 & ~1) | (on ? 1 : 0);
-    return on;
-}
-
-bool usb_charging_enabled(void)
-{
-    return PDAT11 & 1;
 }
 #endif
 
diff --git a/firmware/target/coldfire/iriver/h300/power-h300.c b/firmware/target/coldfire/iriver/h300/power-h300.c
index 400dc02526..202e1d68ed 100644
--- a/firmware/target/coldfire/iriver/h300/power-h300.c
+++ b/firmware/target/coldfire/iriver/h300/power-h300.c
@@ -71,16 +71,14 @@ unsigned int power_input_status(void)
 }
 
 #ifdef HAVE_USB_POWER
-bool usb_charging_enable(bool on)
+void usb_charging_enable(int state)
 {
-    bool rc = false;
+    bool on = (state != USB_CHARGING_DISABLE);
     int irqlevel;
     logf("usb_charging_enable(%s)\n", on ? "on" : "off" );
     irqlevel = disable_irq_save();
     pcf50606_set_usb_charging(on);
-    rc = on;
     restore_irq(irqlevel);
-    return rc;
 }
 #endif /* HAVE_USB_POWER */
 
@@ -92,17 +90,6 @@ bool charging_state(void)
     return (GPIO_READ & 0x00800000)?true:false;
 }
 
-bool usb_charging_enabled(void)
-{
-    bool rc = false;
-    /* TODO: read the state of the GPOOD2 register...
-     * (this also means to set the irq level here) */
-    rc = pcf50606_usb_charging_enabled();
-
-    logf("usb charging %s", rc ? "enabled" : "disabled" );
-    return rc;
-}
-
 void ide_power_enable(bool on)
 {
     if(on)