summaryrefslogtreecommitdiff
path: root/firmware/usb.c
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-01-26 22:53:05 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-01-26 22:53:05 +0000
commitea8bbe3df678d6007bf4ae693fba7c05ec41b79c (patch)
tree6fa807b9669a8070c3f8cc070c28448b25703d9f /firmware/usb.c
parentb579c631b9b9b1f695d26d5372b0b1dc1b08024f (diff)
downloadrockbox-ea8bbe3df678d6007bf4ae693fba7c05ec41b79c.zip
rockbox-ea8bbe3df678d6007bf4ae693fba7c05ec41b79c.tar.gz
rockbox-ea8bbe3df678d6007bf4ae693fba7c05ec41b79c.tar.bz2
rockbox-ea8bbe3df678d6007bf4ae693fba7c05ec41b79c.tar.xz
Enable USB charging mode on H300, hold Rec when inserting the USB connector to not enter USB mode. This may not always work, since we don't yet know how to control the charging chip correctly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8460 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usb.c')
-rw-r--r--firmware/usb.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/firmware/usb.c b/firmware/usb.c
index 13006ab..94175a4 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -55,7 +55,7 @@ void screen_dump(void); /* Nasty again. Defined in apps/ too */
/* Messages from usb_tick and thread states */
#define USB_INSERTED 1
-#define USB_EXTRACTED 2
+#define USB_EXTRACTED 2
#ifdef HAVE_MMC
#define USB_REENABLE 3
#endif
@@ -71,6 +71,9 @@ void screen_dump(void); /* Nasty again. Defined in apps/ too */
#elif CONFIG_KEYPAD == IPOD_4G_PAD
#define USBPOWER_BUTTON BUTTON_MENU
#define USBPOWER_BTN_IGNORE BUTTON_PLAY
+#elif CONFIG_KEYPAD == IRIVER_H300_PAD
+#define USBPOWER_BUTTON BUTTON_REC
+#define USBPOWER_BTN_IGNORE BUTTON_ON
#endif
#endif /* HAVE_USB_POWER */