summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2009-01-10 02:37:44 +0000
committerMichael Sevakis <jethead71@rockbox.org>2009-01-10 02:37:44 +0000
commit21869a1dc344e10ce7f02cd47e2d6983d13dac7e (patch)
tree2f4ca35d0e7d15936d9c8bfa0905a6a561b7ad76
parent4ef890ecee474daca9dc9ee13fdaec3c4bdb4d4e (diff)
downloadrockbox-21869a1dc344e10ce7f02cd47e2d6983d13dac7e.zip
rockbox-21869a1dc344e10ce7f02cd47e2d6983d13dac7e.tar.gz
rockbox-21869a1dc344e10ce7f02cd47e2d6983d13dac7e.tar.bz2
rockbox-21869a1dc344e10ce7f02cd47e2d6983d13dac7e.tar.xz
Gigabeat S: Make sure USB battery maintenece is engaged if fully charged from Main (charger off), USB is configured and Main is unplugged.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19740 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c b/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
index e563fed..c6b3549 100644
--- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
@@ -705,11 +705,17 @@ static void charger_control(void)
else if (pwr & POWER_INPUT_USB_CHARGER
& POWER_INPUT_CHARGER)
{
+ /* USB power only */
if (changed & POWER_INPUT_USB_CHARGER)
{
/* USB charger plugged - try charge */
autorecharge_counter = -1;
}
+ else if (changed & POWER_INPUT_MAIN_CHARGER)
+ {
+ /* Main charger pulled - go to battery maintenence. */
+ charger_setting = CHARGER_ADJUST;
+ }
}
}
}