summaryrefslogtreecommitdiff
path: root/firmware/export/config.h
diff options
context:
space:
mode:
authorTorne Wuff <torne@wolfpuppy.org.uk>2010-06-05 20:43:30 +0000
committerTorne Wuff <torne@wolfpuppy.org.uk>2010-06-05 20:43:30 +0000
commit2eb01425877347f601b1f8b03e07dcb2d690d6d9 (patch)
tree0a589ee0321956d95548261fe2bddfa101356b06 /firmware/export/config.h
parent47181b8b9b0e3e914243a463ad02a2eceab61c6e (diff)
downloadrockbox-2eb01425877347f601b1f8b03e07dcb2d690d6d9.tar.gz
rockbox-2eb01425877347f601b1f8b03e07dcb2d690d6d9.zip
New USB charging system, part 2 - "Force" charging mode
Enable support for the "force" mode of USB charging. This should work on Gigabeat S and Nano2g (and any other future target which has a RB usb stack and supports charging) - if a host connection is not detected within 10 seconds of USB insertion, assume that the connected device is an AC charger and charge anyway, if the user has specified "force" as the mode. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26594 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/config.h')
-rw-r--r--firmware/export/config.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index b73f605d9d..e64ca4127f 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -871,6 +871,13 @@ Lyre prototype 1 */
871#endif 871#endif
872#endif /* HAVE_HEADPHONE_DETECTION */ 872#endif /* HAVE_HEADPHONE_DETECTION */
873 873
874#if defined(HAVE_USB_CHARGING_ENABLE) && defined(HAVE_USBSTACK)
875/* USB charging support in the USB stack requires timeout objects */
876#ifndef INCLUDE_TIMEOUT_API
877#define INCLUDE_TIMEOUT_API
878#endif
879#endif /* HAVE_USB_CHARGING_ENABLE && HAVE_USBSTACK */
880
874#if defined(HAVE_USBSTACK) || (CONFIG_STORAGE & STORAGE_NAND) 881#if defined(HAVE_USBSTACK) || (CONFIG_STORAGE & STORAGE_NAND)
875#define STORAGE_GET_INFO 882#define STORAGE_GET_INFO
876#endif 883#endif