summaryrefslogtreecommitdiffstats
path: root/firmware/export/config/gigabeats.h
diff options
context:
space:
mode:
authorTorne Wuff <torne@wolfpuppy.org.uk>2010-06-05 10:05:27 +0000
committerTorne Wuff <torne@wolfpuppy.org.uk>2010-06-05 10:05:27 +0000
commit991e92fd3dc15f1e365761264c26305559ddb0a4 (patch)
treeac6d18cf1a803c416c0dbc8f61f521444d265ec9 /firmware/export/config/gigabeats.h
parente49464b38735585eaa0ce01f5734c0bcfad851dd (diff)
downloadrockbox-991e92fd3dc15f1e365761264c26305559ddb0a4.tar.gz
rockbox-991e92fd3dc15f1e365761264c26305559ddb0a4.tar.bz2
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/config/gigabeats.h')
-rw-r--r--firmware/export/config/gigabeats.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h
index f096fb07d6..fcfa274314 100644
--- a/firmware/export/config/gigabeats.h
+++ b/firmware/export/config/gigabeats.h
@@ -173,6 +173,8 @@
/* Charging implemented in a target-specific algorithm */
#define CONFIG_CHARGING CHARGING_TARGET
+#define HAVE_USB_CHARGING_ENABLE
+
/* define this if the hardware can be powered off while charging */
/* We don't charge while powered down so maybe implement a
finish-charging-and-then-poweroff mode */