2 files changed, 9 insertions, 8 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