diff options
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c | 9 |
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) | |||
43 | if (GPIO3_DR & (1 << 20)) | 43 | if (GPIO3_DR & (1 << 20)) |
44 | status |= POWER_INPUT_BATTERY; | 44 | status |= POWER_INPUT_BATTERY; |
45 | 45 | ||
46 | if (usb_allowed_current() < 500) | 46 | if (usb_charging_maxcurrent() < 500) |
47 | { | 47 | { |
48 | /* ACK that USB is connected but NOT chargeable */ | 48 | /* ACK that USB is connected but NOT chargeable */ |
49 | status &= ~(POWER_INPUT_USB_CHARGER & POWER_INPUT_CHARGER); | 49 | status &= ~(POWER_INPUT_USB_CHARGER & POWER_INPUT_CHARGER); |
@@ -52,6 +52,12 @@ unsigned int power_input_status(void) | |||
52 | return status; | 52 | return status; |
53 | } | 53 | } |
54 | 54 | ||
55 | void usb_charging_maxcurrent_change(int maxcurrent) | ||
56 | { | ||
57 | (void)maxcurrent; | ||
58 | /* Nothing to do */ | ||
59 | } | ||
60 | |||
55 | /* Detect changes in presence of the AC adaptor. */ | 61 | /* Detect changes in presence of the AC adaptor. */ |
56 | void charger_main_detect_event(void) | 62 | void charger_main_detect_event(void) |
57 | { | 63 | { |
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) | |||
54 | #if CONFIG_CHARGING | 54 | #if CONFIG_CHARGING |
55 | 55 | ||
56 | #ifdef HAVE_USB_CHARGING_ENABLE | 56 | #ifdef HAVE_USB_CHARGING_ENABLE |
57 | bool usb_charging_enable(bool on) | 57 | void usb_charging_maxcurrent_change(int maxcurrent) |
58 | { | 58 | { |
59 | bool on = (maxcurrent >= 500); | ||
59 | PDAT11 = (PDAT11 & ~1) | (on ? 1 : 0); | 60 | PDAT11 = (PDAT11 & ~1) | (on ? 1 : 0); |
60 | return on; | ||
61 | } | ||
62 | |||
63 | bool usb_charging_enabled(void) | ||
64 | { | ||
65 | return PDAT11 & 1; | ||
66 | } | 61 | } |
67 | #endif | 62 | #endif |
68 | 63 | ||