From e6717d1b4d8d1d2e0baeae98b539744e97f24090 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sat, 24 Dec 2011 12:34:16 +0000 Subject: Fix messed up zxbox keymaps. Fixes fuze+ red also. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31417 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/zxbox/keymaps.h | 11 +---------- apps/plugins/zxbox/zxbox_keyb.c | 12 ++---------- 2 files changed, 3 insertions(+), 20 deletions(-) (limited to 'apps/plugins') 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 @@ #define ZX_DOWN BUTTON_DOWN #define ZX_LEFT BUTTON_LEFT #define ZX_RIGHT BUTTON_RIGHT -#define ZX_SELECT BUTTON_SELECT +#define ZX_SELECT BUTTON_SELECT #define ZX_MENU BUTTON_MENU #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD @@ -227,15 +227,6 @@ #define ZX_LEFT BUTTON_LEFT #define ZX_RIGHT BUTTON_RIGHT -#elif CONFIG_KEYPAD == SAMSUNG_YPR0_PAD - -#define ZX_MENU BUTTON_MENU -#define ZX_UP BUTTON_UP -#define ZX_DOWN BUTTON_DOWN -#define ZX_SELECT BUTTON_CENTER -#define ZX_LEFT BUTTON_LEFT -#define ZX_RIGHT BUTTON_RIGHT - #else #error Keymap not defined! 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 @@ #define KBD_UP BUTTON_UP #define KBD_DOWN BUTTON_DOWN -#elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD - -#define KBD_SELECT BUTTON_CENTER -#define KBD_ABORT BUTTON_BACK -#define KBD_LEFT BUTTON_LEFT -#define KBD_RIGHT BUTTON_RIGHT -#define KBD_UP BUTTON_UP -#define KBD_DOWN BUTTON_DOWN - -#elif CONFIG_KEYPAD == SAMSUNG_YPR0_PAD +#elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD || \ + CONFIG_KEYPAD == SAMSUNG_YPR0_PAD #define KBD_SELECT BUTTON_SELECT #define KBD_ABORT BUTTON_BACK -- cgit v1.2.3