summaryrefslogtreecommitdiff
path: root/firmware/usb.c
diff options
context:
space:
mode:
authorMarcoen Hirschberg <marcoen@gmail.com>2006-08-12 08:01:54 +0000
committerMarcoen Hirschberg <marcoen@gmail.com>2006-08-12 08:01:54 +0000
commitdd754886f5fd4004b521c954e263772d35fb6a46 (patch)
treebcf072bd18da2c7d2b5aa0ebbb89a01a50354f23 /firmware/usb.c
parente6ed58f6c545719ed804c9ad513496f8d0fa0286 (diff)
downloadrockbox-dd754886f5fd4004b521c954e263772d35fb6a46.tar.gz
rockbox-dd754886f5fd4004b521c954e263772d35fb6a46.zip
update the gigabeat code and move to target_tree
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10535 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usb.c')
-rw-r--r--firmware/usb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/firmware/usb.c b/firmware/usb.c
index a8a3e6b3eb..6be5fda093 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -77,6 +77,9 @@ void screen_dump(void); /* Nasty again. Defined in apps/ too */
77#elif CONFIG_KEYPAD == IRIVER_H300_PAD 77#elif CONFIG_KEYPAD == IRIVER_H300_PAD
78#define USBPOWER_BUTTON BUTTON_REC 78#define USBPOWER_BUTTON BUTTON_REC
79#define USBPOWER_BTN_IGNORE BUTTON_ON 79#define USBPOWER_BTN_IGNORE BUTTON_ON
80#elif CONFIG_KEYPAD == GIGABEAT_PAD
81#define USBPOWER_BUTTON BUTTON_MENU
82#define USBPOWER_BTN_IGNORE BUTTON_POWER
80#endif 83#endif
81#endif /* HAVE_USB_POWER */ 84#endif /* HAVE_USB_POWER */
82 85
@@ -191,6 +194,8 @@ void usb_enable(bool on)
191 (void) on; 194 (void) on;
192#elif defined(USB_X5STYLE) 195#elif defined(USB_X5STYLE)
193 /* TODO X5 */ 196 /* TODO X5 */
197#elif defined(USB_GIGABEAT_STYLE)
198 /* TODO gigabeat */
194#else 199#else
195#ifdef HAVE_LCD_BITMAP 200#ifdef HAVE_LCD_BITMAP
196 if(read_hw_mask() & USB_ACTIVE_HIGH) 201 if(read_hw_mask() & USB_ACTIVE_HIGH)