diff options
| author | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
|---|---|---|
| committer | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
| commit | 590501cfe404b5463adecc70628e5bc7c8f142a2 (patch) | |
| tree | 3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /firmware/export/usb.h | |
| parent | a26110c52dff9bc15d20146462d52d07f61bd238 (diff) | |
| download | rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip | |
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/usb.h')
| -rw-r--r-- | firmware/export/usb.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/firmware/export/usb.h b/firmware/export/usb.h index 0c4231a4e5..17dbafa10e 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h | |||
| @@ -47,6 +47,9 @@ | |||
| 47 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 47 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
| 48 | #define USBPOWER_BUTTON BUTTON_MENU | 48 | #define USBPOWER_BUTTON BUTTON_MENU |
| 49 | #define USBPOWER_BTN_IGNORE BUTTON_POWER | 49 | #define USBPOWER_BTN_IGNORE BUTTON_POWER |
| 50 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
| 51 | #define USBPOWER_BUTTON BUTTON_MENU | ||
| 52 | #define USBPOWER_BTN_IGNORE BUTTON_BACK | ||
| 50 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 53 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
| 51 | #define USBPOWER_BUTTON BUTTON_NONE | 54 | #define USBPOWER_BUTTON BUTTON_NONE |
| 52 | #define USBPOWER_BTN_IGNORE BUTTON_POWER | 55 | #define USBPOWER_BTN_IGNORE BUTTON_POWER |