len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

New USB charging system, part 1 - API rework and user-visible setting update

Browse source 
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
This commit is contained in:
Torne Wuff 2010-06-05 10:05:27 +00:00
parent e49464b387
commit 991e92fd3d
11 changed files with 87 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
View file

@ -43,7 +43,7 @@ unsigned int power_input_status(void)
if (GPIO3_DR & (1 << 20))
status |= POWER_INPUT_BATTERY;
if (usb_allowed_current() < 500)
if (usb_charging_maxcurrent() < 500)
{
/* ACK that USB is connected but NOT chargeable */
status &= ~(POWER_INPUT_USB_CHARGER & POWER_INPUT_CHARGER);
@ -52,6 +52,12 @@ unsigned int power_input_status(void)
return status;
}
void usb_charging_maxcurrent_change(int maxcurrent)
{
(void)maxcurrent;
/* Nothing to do */
}
/* Detect changes in presence of the AC adaptor. */
void charger_main_detect_event(void)
{