diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-12-24 19:36:37 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-12-24 19:36:37 +0000 |
commit | 377b42b63bf49e72f49969ad96eeeef8cc3c4ce2 (patch) | |
tree | 3167e772e655c71c4dc58a2ceaa8a190d65ff287 /firmware/target | |
parent | 9b8f56f35cfd67a1438ef7a6676319405b226d5d (diff) | |
download | rockbox-377b42b63bf49e72f49969ad96eeeef8cc3c4ce2.tar.gz rockbox-377b42b63bf49e72f49969ad96eeeef8cc3c4ce2.zip |
H10 can distinguish USB and MAIN charger input so return proper flags. H100s were misconfigured and should use CHARGING_SIMPLE. Comment more on what charging types mean in config.h.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19582 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/iriver/h10/power-h10.c | 12 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h100/power-h100.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c index 1a1f6afbfb..2535c5839f 100644 --- a/firmware/target/arm/iriver/h10/power-h10.c +++ b/firmware/target/arm/iriver/h10/power-h10.c | |||
@@ -50,9 +50,15 @@ void power_init(void) | |||
50 | 50 | ||
51 | unsigned int power_input_status(void) | 51 | unsigned int power_input_status(void) |
52 | { | 52 | { |
53 | /* No separate source for USB and charges from USB on its own */ | 53 | unsigned int status = POWER_INPUT_NONE; |
54 | return (GPIOF_INPUT_VAL & 0x08) ? | 54 | |
55 | POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE; | 55 | if (GPIOF_INPUT_VAL & 0x08) |
56 | status = POWER_INPUT_MAIN_CHARGER; | ||
57 | |||
58 | if (GPIOL_INPUT_VAL & 0x04) | ||
59 | status |= POWER_INPUT_USB_CHARGER; | ||
60 | |||
61 | return status; | ||
56 | } | 62 | } |
57 | 63 | ||
58 | void ide_power_enable(bool on) | 64 | void ide_power_enable(bool on) |
diff --git a/firmware/target/coldfire/iriver/h100/power-h100.c b/firmware/target/coldfire/iriver/h100/power-h100.c index 2717e42f4a..1dcea9ce0e 100644 --- a/firmware/target/coldfire/iriver/h100/power-h100.c +++ b/firmware/target/coldfire/iriver/h100/power-h100.c | |||
@@ -57,12 +57,6 @@ unsigned int power_input_status(void) | |||
57 | POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE; | 57 | POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE; |
58 | } | 58 | } |
59 | 59 | ||
60 | /* Returns true if the unit is charging the batteries. */ | ||
61 | bool charging_state(void) | ||
62 | { | ||
63 | return (power_input_status() & POWER_INPUT_CHARGER) != 0; | ||
64 | } | ||
65 | |||
66 | #ifdef HAVE_SPDIF_POWER | 60 | #ifdef HAVE_SPDIF_POWER |
67 | void spdif_power_enable(bool on) | 61 | void spdif_power_enable(bool on) |
68 | { | 62 | { |