diff options
| author | Torne Wuff <torne@wolfpuppy.org.uk> | 2010-06-05 10:05:27 +0000 |
|---|---|---|
| committer | Torne Wuff <torne@wolfpuppy.org.uk> | 2010-06-05 10:05:27 +0000 |
| commit | 991e92fd3dc15f1e365761264c26305559ddb0a4 (patch) | |
| tree | ac6d18cf1a803c416c0dbc8f61f521444d265ec9 /firmware/export/usb_core.h | |
| parent | e49464b38735585eaa0ce01f5734c0bcfad851dd (diff) | |
| download | rockbox-991e92fd3dc15f1e365761264c26305559ddb0a4.tar.gz rockbox-991e92fd3dc15f1e365761264c26305559ddb0a4.zip | |
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
Diffstat (limited to 'firmware/export/usb_core.h')
| -rw-r--r-- | firmware/export/usb_core.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/firmware/export/usb_core.h b/firmware/export/usb_core.h index 5286dbcdfe..6405aa492d 100644 --- a/firmware/export/usb_core.h +++ b/firmware/export/usb_core.h @@ -59,8 +59,14 @@ void usb_core_release_endpoint(int dir); void usb_core_hotswap_event(int volume,bool inserted); #endif -#ifdef HAVE_USB_POWER -unsigned short usb_allowed_current(void); +#ifdef HAVE_USB_CHARGING_ENABLE +/* hardware which knows how to control usb current should use one + * of the following to find out from the usb stack how much is ok + */ +/* implemented by target, called by usb when value changes */ +void usb_charging_maxcurrent_change(int maxcurrent); +/* implemented by usb, called by target to get value */ +int usb_charging_maxcurrent(void); #endif #endif |