From 450a4e438085972eaffe94b706c427fafced822c Mon Sep 17 00:00:00 2001 From: Robert Menes Date: Tue, 2 Nov 2010 10:58:08 +0000 Subject: [PATCH] Commit a few more GoGear HDD6330 keymaps. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28445 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/beatbox/beatbox.c | 18 ++++++++++++++++++ apps/plugins/chessbox/chessbox_pgn.h | 10 ++++++++++ apps/plugins/cube.c | 10 ++++++++++ apps/plugins/lib/pluginlib_actions.c | 6 ++++-- apps/plugins/pacbox/pacbox.h | 11 +++++++++++ apps/plugins/superdom.c | 8 ++++++++ 6 files changed, 61 insertions(+), 2 deletions(-) diff --git a/apps/plugins/beatbox/beatbox.c b/apps/plugins/beatbox/beatbox.c index 34c72570e3..b09464ab14 100644 --- a/apps/plugins/beatbox/beatbox.c +++ b/apps/plugins/beatbox/beatbox.c @@ -81,6 +81,24 @@ #define BTN_UP BUTTON_SCROLL_UP #define BTN_DOWN BUTTON_SCROLL_DOWN +#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD +#define BTN_QUIT BUTTON_POWER +#define BTN_RIGHT BUTTON_RIGHT +#define BTN_UP BUTTON_UP +#define BTN_DOWN BUTTON_DOWN + +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +#define BTN_QUIT BUTTON_POWER +#define BTN_RIGHT BUTTON_NEXT +#define BTN_UP BUTTON_UP +#define BTN_DOWN BUTTON_DOWN + +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD +#define BTN_QUIT BUTTON_POWER +#define BTN_RIGHT BUTTON_NEXT +#define BTN_UP BUTTON_UP +#define BTN_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD #define BTN_QUIT BUTTON_PLAY #define BTN_RIGHT BUTTON_RIGHT diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 2ae27e901f..df90151522 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h @@ -323,6 +323,16 @@ #define CB_LEVEL BUTTON_PLAYLIST #define CB_MENU BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +#define CB_SELECT BUTTON_PLAY +#define CB_UP BUTTON_UP +#define CB_DOWN BUTTON_DOWN +#define CB_LEFT BUTTON_PREV +#define CB_RIGHT BUTTON_NEXT +#define CB_PLAY BUTTON_RIGHT +#define CB_LEVEL BUTTON_LEFT +#define CB_MENU BUTTON_MENU + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define CB_SELECT BUTTON_PLAY #define CB_UP BUTTON_UP diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 3fafab05b8..0555bc5e37 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -244,6 +244,16 @@ #define CUBE_PAUSE BUTTON_SELECT #define CUBE_HIGHSPEED BUTTON_VIEW +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +#define CUBE_QUIT BUTTON_POWER +#define CUBE_NEXT BUTTON_NEXT +#define CUBE_PREV BUTTON_PREV +#define CUBE_INC BUTTON_UP +#define CUBE_DEC BUTTON_DOWN +#define CUBE_MODE BUTTON_MENU +#define CUBE_PAUSE BUTTON_PLAY +#define CUBE_HIGHSPEED BUTTON_RIGHT + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define CUBE_QUIT BUTTON_POWER #define CUBE_NEXT BUTTON_NEXT diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index ee052c5060..0d95bc8d87 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c @@ -163,7 +163,8 @@ const struct button_mapping pla_main_ctx[] = { PLA_DOWN_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, -#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) +#elif (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) \ + || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) { PLA_UP, BUTTON_UP, BUTTON_NONE }, { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE }, { PLA_LEFT, BUTTON_PREV, BUTTON_NONE }, @@ -322,7 +323,8 @@ const struct button_mapping pla_main_ctx[] = {PLA_SELECT, BUTTON_RC_MODE, BUTTON_NONE}, {PLA_SELECT_REL, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE}, {PLA_SELECT_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE}, -#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) +#elif (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) \ + || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, {PLA_CANCEL, BUTTON_MENU, BUTTON_NONE}, {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index f4cc738b02..a15aef7a10 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h @@ -192,6 +192,17 @@ #define PACMAN_COIN BUTTON_VIEW #define PACMAN_MENU BUTTON_MENU +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD + +#define PACMAN_UP BUTTON_NEXT +#define PACMAN_DOWN BUTTON_PREV +#define PACMAN_LEFT BUTTON_UP +#define PACMAN_RIGHT BUTTON_DOWN +#define PACMAN_1UP BUTTON_VOL_UP +#define PACMAN_2UP BUTTON_DOWN +#define PACMAN_COIN BUTTON_RIGHT +#define PACMAN_MENU BUTTON_MENU + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define PACMAN_UP BUTTON_UP diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index ad54c565b2..f4cefdfa4e 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c @@ -139,6 +139,14 @@ char buf[255]; #define SUPERDOM_RIGHT BUTTON_RIGHT #define SUPERDOM_CANCEL BUTTON_BACK +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD +#define SUPERDOM_OK BUTTON_PLAY +#define SUPERDOM_UP BUTTON_UP +#define SUPERDOM_DOWN BUTTON_DOWN +#define SUPERDOM_LEFT BUTTON_PREV +#define SUPERDOM_RIGHT BUTTON_NEXT +#define SUPERDOM_CANCEL BUTTON_LEFT + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define SUPERDOM_OK BUTTON_PLAY #define SUPERDOM_UP BUTTON_UP