From 991e92fd3dc15f1e365761264c26305559ddb0a4 Mon Sep 17 00:00:00 2001 From: Torne Wuff Date: Sat, 5 Jun 2010 10:05:27 +0000 Subject: New USB charging system, part 1 - API rework and user-visible setting update 1) "Charge during USB connection" option is now tristate: off/on/force. Currently "force" behaves just like "on", but in future it will allow charging even when it was not possible to positively identify a charger. 2) The H300 code has been adjusted to use the new system but there should be no functional differences, it already had the USB charging option and its USB/charging support is hardware controlled. 3) The Gigabeat S code has been adjusted to use the new system: the player now has the USB charging option, which wasn't previously available. The player will only charge at full speed when allowed to do so by a working USB host, so USB AC adapters won't work very well; however, they didn't work before either, so this is not a change in functionality. 4) The iPod Nano 2G code has been adjusted to use the new system: it already had the USB charging option. Using a USB AC adapter won't charge at full speed any more (it did before) - the old implementation was equivalent to the not-yet-implemented "force" option in the new system. No other target should be affected. Support for the "force" mode and support for at least some other iPod models will come in a future commit :) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26570 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/coldfire/iriver/h300/power-h300.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'firmware/target/coldfire/iriver/h300/power-h300.c') diff --git a/firmware/target/coldfire/iriver/h300/power-h300.c b/firmware/target/coldfire/iriver/h300/power-h300.c index 400dc02526..202e1d68ed 100644 --- a/firmware/target/coldfire/iriver/h300/power-h300.c +++ b/firmware/target/coldfire/iriver/h300/power-h300.c @@ -71,16 +71,14 @@ unsigned int power_input_status(void) } #ifdef HAVE_USB_POWER -bool usb_charging_enable(bool on) +void usb_charging_enable(int state) { - bool rc = false; + bool on = (state != USB_CHARGING_DISABLE); int irqlevel; logf("usb_charging_enable(%s)\n", on ? "on" : "off" ); irqlevel = disable_irq_save(); pcf50606_set_usb_charging(on); - rc = on; restore_irq(irqlevel); - return rc; } #endif /* HAVE_USB_POWER */ @@ -92,17 +90,6 @@ bool charging_state(void) return (GPIO_READ & 0x00800000)?true:false; } -bool usb_charging_enabled(void) -{ - bool rc = false; - /* TODO: read the state of the GPOOD2 register... - * (this also means to set the irq level here) */ - rc = pcf50606_usb_charging_enabled(); - - logf("usb charging %s", rc ? "enabled" : "disabled" ); - return rc; -} - void ide_power_enable(bool on) { if(on) -- cgit v1.2.3