diff options
Diffstat (limited to 'apps/plugins/zxbox')
-rw-r--r-- | apps/plugins/zxbox/keymaps.h | 11 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox_keyb.c | 12 |
2 files changed, 3 insertions, 20 deletions
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 317e67cd9f..831c6d8e69 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #define ZX_DOWN BUTTON_DOWN | 35 | #define ZX_DOWN BUTTON_DOWN |
36 | #define ZX_LEFT BUTTON_LEFT | 36 | #define ZX_LEFT BUTTON_LEFT |
37 | #define ZX_RIGHT BUTTON_RIGHT | 37 | #define ZX_RIGHT BUTTON_RIGHT |
38 | #define ZX_SELECT BUTTON_SELECT | 38 | #define ZX_SELECT BUTTON_SELECT |
39 | #define ZX_MENU BUTTON_MENU | 39 | #define ZX_MENU BUTTON_MENU |
40 | 40 | ||
41 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 41 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
@@ -227,15 +227,6 @@ | |||
227 | #define ZX_LEFT BUTTON_LEFT | 227 | #define ZX_LEFT BUTTON_LEFT |
228 | #define ZX_RIGHT BUTTON_RIGHT | 228 | #define ZX_RIGHT BUTTON_RIGHT |
229 | 229 | ||
230 | #elif CONFIG_KEYPAD == SAMSUNG_YPR0_PAD | ||
231 | |||
232 | #define ZX_MENU BUTTON_MENU | ||
233 | #define ZX_UP BUTTON_UP | ||
234 | #define ZX_DOWN BUTTON_DOWN | ||
235 | #define ZX_SELECT BUTTON_CENTER | ||
236 | #define ZX_LEFT BUTTON_LEFT | ||
237 | #define ZX_RIGHT BUTTON_RIGHT | ||
238 | |||
239 | #else | 230 | #else |
240 | #error Keymap not defined! | 231 | #error Keymap not defined! |
241 | 232 | ||
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index e8b5219de3..0d4b889a9b 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -223,16 +223,8 @@ | |||
223 | #define KBD_UP BUTTON_UP | 223 | #define KBD_UP BUTTON_UP |
224 | #define KBD_DOWN BUTTON_DOWN | 224 | #define KBD_DOWN BUTTON_DOWN |
225 | 225 | ||
226 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 226 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD || \ |
227 | 227 | CONFIG_KEYPAD == SAMSUNG_YPR0_PAD | |
228 | #define KBD_SELECT BUTTON_CENTER | ||
229 | #define KBD_ABORT BUTTON_BACK | ||
230 | #define KBD_LEFT BUTTON_LEFT | ||
231 | #define KBD_RIGHT BUTTON_RIGHT | ||
232 | #define KBD_UP BUTTON_UP | ||
233 | #define KBD_DOWN BUTTON_DOWN | ||
234 | |||
235 | #elif CONFIG_KEYPAD == SAMSUNG_YPR0_PAD | ||
236 | 228 | ||
237 | #define KBD_SELECT BUTTON_SELECT | 229 | #define KBD_SELECT BUTTON_SELECT |
238 | #define KBD_ABORT BUTTON_BACK | 230 | #define KBD_ABORT BUTTON_BACK |