From 58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Wed, 3 Dec 2008 19:54:25 +0000 Subject: 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 --- firmware/target/arm/iriver/h10/power-h10.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'firmware/target/arm/iriver') 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) { } -bool charger_inserted(void) +unsigned int power_input_status(void) { - return (GPIOF_INPUT_VAL & 0x08)?true:false; + /* No separate source for USB and charges from USB on its own */ + return (GPIOF_INPUT_VAL & 0x08) ? + POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE; } void ide_power_enable(bool on) -- cgit