From 7f7aee3f2457818547ec065ddd65bea0b3a68983 Mon Sep 17 00:00:00 2001 From: Sebastian Leonhardt Date: Thu, 22 May 2014 23:34:52 +0200 Subject: Separate keymaps for YH-820 and YH-920/925 Although both players basically have the same keys, the differences in the layout is rather big, so I think both deserve their own keymaps. (On the yh820 the FFWD/PLAY/REW buttons are located above the direction keys, on the yh920 at the side of the player. Furthermore the yh920/925 has a REC switch, whereas yh820 has a push button.) Change-Id: I0e62a1b101c387646c0bdb07ea142d9d2430ca15 Reviewed-on: http://gerrit.rockbox.org/814 Reviewed-by: Szymon Dziok --- apps/plugins/zxbox/keymaps.h | 3 ++- apps/plugins/zxbox/zxbox_keyb.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'apps/plugins/zxbox') diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 28073ac8d4..659bcca40a 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -190,7 +190,8 @@ #elif CONFIG_KEYPAD == ONDAVX777_PAD #define ZX_MENU BUTTON_POWER -#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD +#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ + (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) #define ZX_UP BUTTON_UP #define ZX_DOWN BUTTON_DOWN diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index e09fe9a7d8..62f593df37 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -197,7 +197,8 @@ #define KBD_UP BUTTON_UP #define KBD_DOWN BUTTON_DOWN -#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD +#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ + (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) #define KBD_SELECT BUTTON_PLAY #define KBD_ABORT BUTTON_REW -- cgit v1.2.3