diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/bookmark.h | 2 | ||||
-rw-r--r-- | apps/gui/gwps.h | 2 | ||||
-rw-r--r-- | apps/gui/list.h | 2 | ||||
-rw-r--r-- | apps/gui/select.h | 2 | ||||
-rw-r--r-- | apps/gui/yesno.h | 2 | ||||
-rw-r--r-- | apps/menu.h | 2 | ||||
-rw-r--r-- | apps/recorder/keyboard.c | 2 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/tree.h | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/apps/bookmark.h b/apps/bookmark.h index adb6613482..f6f6bc8019 100644 --- a/apps/bookmark.h +++ b/apps/bookmark.h | |||
@@ -33,7 +33,7 @@ | |||
33 | #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT) | 33 | #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT) |
34 | #define BOOKMARK_DOWN BUTTON_DOWN | 34 | #define BOOKMARK_DOWN BUTTON_DOWN |
35 | 35 | ||
36 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 36 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
37 | #define BOOKMARK_SELECT BUTTON_SELECT | 37 | #define BOOKMARK_SELECT BUTTON_SELECT |
38 | #define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT) | 38 | #define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT) |
39 | #define BOOKMARK_DOWN BUTTON_SCROLL_FWD | 39 | #define BOOKMARK_DOWN BUTTON_SCROLL_FWD |
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 9209cb9b1b..4d586147af 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -175,7 +175,7 @@ | |||
175 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) | 175 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) |
176 | #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) | 176 | #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) |
177 | 177 | ||
178 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 178 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
179 | 179 | ||
180 | /* TODO: Check WPS button assignments */ | 180 | /* TODO: Check WPS button assignments */ |
181 | 181 | ||
diff --git a/apps/gui/list.h b/apps/gui/list.h index 8643c4d047..23a0fc37b8 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h | |||
@@ -73,7 +73,7 @@ | |||
73 | #define LIST_PGRIGHT (BUTTON_MENU | BUTTON_RIGHT) | 73 | #define LIST_PGRIGHT (BUTTON_MENU | BUTTON_RIGHT) |
74 | #define LIST_PGLEFT (BUTTON_MENU | BUTTON_LEFT) | 74 | #define LIST_PGLEFT (BUTTON_MENU | BUTTON_LEFT) |
75 | 75 | ||
76 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 76 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
77 | #define LIST_NEXT BUTTON_SCROLL_FWD | 77 | #define LIST_NEXT BUTTON_SCROLL_FWD |
78 | #define LIST_PREV BUTTON_SCROLL_BACK | 78 | #define LIST_PREV BUTTON_SCROLL_BACK |
79 | 79 | ||
diff --git a/apps/gui/select.h b/apps/gui/select.h index 00c05c8d58..d0e545bd51 100644 --- a/apps/gui/select.h +++ b/apps/gui/select.h | |||
@@ -54,7 +54,7 @@ | |||
54 | #define SELECT_CANCEL BUTTON_STOP | 54 | #define SELECT_CANCEL BUTTON_STOP |
55 | #define SELECT_CANCEL2 BUTTON_MENU | 55 | #define SELECT_CANCEL2 BUTTON_MENU |
56 | 56 | ||
57 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 57 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
58 | #define SELECT_INC BUTTON_SCROLL_FWD | 58 | #define SELECT_INC BUTTON_SCROLL_FWD |
59 | #define SELECT_DEC BUTTON_SCROLL_BACK | 59 | #define SELECT_DEC BUTTON_SCROLL_BACK |
60 | #define SELECT_OK BUTTON_SELECT | 60 | #define SELECT_OK BUTTON_SELECT |
diff --git a/apps/gui/yesno.h b/apps/gui/yesno.h index a39a2cbc69..20df1b5037 100644 --- a/apps/gui/yesno.h +++ b/apps/gui/yesno.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #elif CONFIG_KEYPAD == GMINI100_PAD | 23 | #elif CONFIG_KEYPAD == GMINI100_PAD |
24 | #define YESNO_OK BUTTON_PLAY | 24 | #define YESNO_OK BUTTON_PLAY |
25 | 25 | ||
26 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 26 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
27 | #define YESNO_OK BUTTON_RIGHT | 27 | #define YESNO_OK BUTTON_RIGHT |
28 | 28 | ||
29 | #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) | 29 | #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) |
diff --git a/apps/menu.h b/apps/menu.h index cb96227dc1..2130a00683 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -68,7 +68,7 @@ | |||
68 | #define MENU_ENTER BUTTON_RIGHT | 68 | #define MENU_ENTER BUTTON_RIGHT |
69 | #define MENU_ENTER2 BUTTON_PLAY | 69 | #define MENU_ENTER2 BUTTON_PLAY |
70 | 70 | ||
71 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 71 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
72 | 72 | ||
73 | /* TODO: Check menu button assignments */ | 73 | /* TODO: Check menu button assignments */ |
74 | 74 | ||
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 5bbc2140cb..13e7625bc4 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -101,7 +101,7 @@ | |||
101 | #define KBD_UP BUTTON_UP | 101 | #define KBD_UP BUTTON_UP |
102 | #define KBD_DOWN BUTTON_DOWN | 102 | #define KBD_DOWN BUTTON_DOWN |
103 | 103 | ||
104 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 104 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
105 | 105 | ||
106 | #define KBD_MODES /* iPod uses 2 modes, picker and line edit */ | 106 | #define KBD_MODES /* iPod uses 2 modes, picker and line edit */ |
107 | #define KBD_SELECT (BUTTON_SELECT | BUTTON_REL) /* backspace in line edit */ | 107 | #define KBD_SELECT (BUTTON_SELECT | BUTTON_REL) /* backspace in line edit */ |
diff --git a/apps/settings.h b/apps/settings.h index 53dfde0c50..3255f61ff3 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -92,7 +92,7 @@ | |||
92 | #define SETTINGS_NEXT BUTTON_RIGHT | 92 | #define SETTINGS_NEXT BUTTON_RIGHT |
93 | #define SETTINGS_ACCEPT BUTTON_MENU | 93 | #define SETTINGS_ACCEPT BUTTON_MENU |
94 | 94 | ||
95 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 95 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
96 | #define SETTINGS_INC BUTTON_SCROLL_FWD | 96 | #define SETTINGS_INC BUTTON_SCROLL_FWD |
97 | #define SETTINGS_DEC BUTTON_SCROLL_BACK | 97 | #define SETTINGS_DEC BUTTON_SCROLL_BACK |
98 | #define SETTINGS_OK BUTTON_SELECT | 98 | #define SETTINGS_OK BUTTON_SELECT |
diff --git a/apps/tree.h b/apps/tree.h index 0967fb373f..8fdcc883cf 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -135,7 +135,7 @@ | |||
135 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) | 135 | #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) |
136 | #define TREE_POWER_BTN BUTTON_ON | 136 | #define TREE_POWER_BTN BUTTON_ON |
137 | 137 | ||
138 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 138 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
139 | 139 | ||
140 | #define TREE_NEXT BUTTON_SCROLL_FWD | 140 | #define TREE_NEXT BUTTON_SCROLL_FWD |
141 | #define TREE_PREV BUTTON_SCROLL_BACK | 141 | #define TREE_PREV BUTTON_SCROLL_BACK |