summaryrefslogtreecommitdiff
path: root/apps/plugins/zxbox
diff options
context:
space:
mode:
authorSebastian Leonhardt <sebastian.leonhardt@web.de>2014-05-22 23:34:52 +0200
committerSzymon Dziok <b0hoon@o2.pl>2014-05-24 00:50:11 +0200
commit7f7aee3f2457818547ec065ddd65bea0b3a68983 (patch)
tree84cfadca3187bf65d569cb5456c8d78245823b23 /apps/plugins/zxbox
parent4b181b4517fad106ab1ffbdab01adac9cf8e4bee (diff)
downloadrockbox-7f7aee3f2457818547ec065ddd65bea0b3a68983.tar.gz
rockbox-7f7aee3f2457818547ec065ddd65bea0b3a68983.zip
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 <b0hoon@o2.pl>
Diffstat (limited to 'apps/plugins/zxbox')
-rw-r--r--apps/plugins/zxbox/keymaps.h3
-rw-r--r--apps/plugins/zxbox/zxbox_keyb.c3
2 files changed, 4 insertions, 2 deletions
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 @@
190#elif CONFIG_KEYPAD == ONDAVX777_PAD 190#elif CONFIG_KEYPAD == ONDAVX777_PAD
191#define ZX_MENU BUTTON_POWER 191#define ZX_MENU BUTTON_POWER
192 192
193#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 193#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
194 (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
194 195
195#define ZX_UP BUTTON_UP 196#define ZX_UP BUTTON_UP
196#define ZX_DOWN BUTTON_DOWN 197#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 @@
197#define KBD_UP BUTTON_UP 197#define KBD_UP BUTTON_UP
198#define KBD_DOWN BUTTON_DOWN 198#define KBD_DOWN BUTTON_DOWN
199 199
200#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD 200#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
201 (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
201 202
202#define KBD_SELECT BUTTON_PLAY 203#define KBD_SELECT BUTTON_PLAY
203#define KBD_ABORT BUTTON_REW 204#define KBD_ABORT BUTTON_REW