diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-12-03 19:54:25 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-12-03 19:54:25 +0000 |
commit | 58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657 (patch) | |
tree | 084c7b7c5d374fbfef2f8cddb3673a3b2a26a7df /firmware/target/arm/iriver/h10/power-h10.c | |
parent | 0d0cc039f88ced4f6db5c4468b19913f52cd08c8 (diff) | |
download | rockbox-58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657.tar.gz rockbox-58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657.zip |
Straighten out some powermanagement stuff. Give target complete control over how power inputs are sensed. Clean SIMULATOR stuff out of target files. Get rid of USB charging option on targets that don't support it or don't implement it yet. Menu string remains to avoid language incompatibility but should be removed on next cleanup for targets not using it (notice in english.lang). global_settings becomes incompatible for some builds and so plugin API version is incremented.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19315 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/iriver/h10/power-h10.c')
-rw-r--r-- | firmware/target/arm/iriver/h10/power-h10.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c index dd09387889..deca3258e2 100644 --- a/firmware/target/arm/iriver/h10/power-h10.c +++ b/firmware/target/arm/iriver/h10/power-h10.c | |||
@@ -52,9 +52,11 @@ void power_init(void) | |||
52 | { | 52 | { |
53 | } | 53 | } |
54 | 54 | ||
55 | bool charger_inserted(void) | 55 | unsigned int power_input_status(void) |
56 | { | 56 | { |
57 | return (GPIOF_INPUT_VAL & 0x08)?true:false; | 57 | /* No separate source for USB and charges from USB on its own */ |
58 | return (GPIOF_INPUT_VAL & 0x08) ? | ||
59 | POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE; | ||
58 | } | 60 | } |
59 | 61 | ||
60 | void ide_power_enable(bool on) | 62 | void ide_power_enable(bool on) |