diff options
author | Andrew Ryabinin <ryabinin.a.a@gmail.com> | 2012-04-21 12:49:38 +0400 |
---|---|---|
committer | Andrew Ryabinin <ryabinin.a.a@gmail.com> | 2012-04-22 00:00:24 +0400 |
commit | 1060d30bdd9961ced908e4e7a06fada04a50965e (patch) | |
tree | 42da0158e3f9c387dcc565a2c348e44cafc559ce | |
parent | 2d3c43dffeb048297313cd9333731d47d66010a0 (diff) | |
download | rockbox-1060d30bdd9961ced908e4e7a06fada04a50965e.tar.gz rockbox-1060d30bdd9961ced908e4e7a06fada04a50965e.zip |
hm60x: Fix charger detection.
Change-Id: Icde96e90303a9b6f3d399f3c25f24cc0b7d8576b
-rw-r--r-- | firmware/target/arm/rk27xx/hm60x/power-hm60x.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/firmware/target/arm/rk27xx/hm60x/power-hm60x.c b/firmware/target/arm/rk27xx/hm60x/power-hm60x.c index 45cc390d13..538d00f5ec 100644 --- a/firmware/target/arm/rk27xx/hm60x/power-hm60x.c +++ b/firmware/target/arm/rk27xx/hm60x/power-hm60x.c | |||
@@ -40,10 +40,18 @@ void power_init(void) | |||
40 | 40 | ||
41 | unsigned int power_input_status(void) | 41 | unsigned int power_input_status(void) |
42 | { | 42 | { |
43 | return (usb_detect() == USB_INSERTED) ? POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE; | 43 | unsigned int status = POWER_INPUT_NONE; |
44 | |||
45 | if (!(GPIO_PADR & 0x80)) | ||
46 | status |= POWER_INPUT_MAIN_CHARGER; | ||
47 | |||
48 | if (usb_detect() == USB_INSERTED) | ||
49 | status |= POWER_INPUT_USB_CHARGER; | ||
50 | |||
51 | return status; | ||
44 | } | 52 | } |
45 | 53 | ||
46 | bool charging_state(void) | 54 | bool charging_state(void) |
47 | { | 55 | { |
48 | return true; | 56 | return (bool)(!(GPIO_PADR & 0x80)); |
49 | } | 57 | } |