From 98ed07bcf8110111843e5832406108017457f8fd Mon Sep 17 00:00:00 2001 From: Robert Menes Date: Wed, 3 Nov 2010 03:23:14 +0000 Subject: Okay, this should be the last few "prevent red" fixes to be done on the GoGear HDD6330 plugin keymaps. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28470 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/fft/fft.c | 2 +- apps/plugins/sokoban.c | 2 +- apps/plugins/star.c | 1 + apps/plugins/zxbox/zxbox_keyb.c | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c index 9cca99adbe..572ee5325f 100644 --- a/apps/plugins/fft/fft.c +++ b/apps/plugins/fft/fft.c @@ -183,7 +183,7 @@ GREY_INFO_STRUCT #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD # define FFT_PREV_GRAPH BUTTON_PREV -# define FFT_NEVT_GRAPH BUTTON_NEXT +# define FFT_NEXT_GRAPH BUTTON_NEXT # define FFT_ORIENTATION BUTTON_PLAY # define FFT_WINDOW BUTTON_MENU # define FFT_AMP_SCALE BUTTON_UP diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 25cd51bf12..b14132c7f6 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -393,7 +393,7 @@ #define SOKOBAN_UP BUTTON_UP #define SOKOBAN_DOWN BUTTON_DOWN #define SOKOBAN_MENU BUTTON_MENU -#define SOKOBAN_UNDO BUTTON_LEFT +#define SOKOBAN_UNDO BUTTON_PREV #define SOKOBAN_REDO (BUTTON_PLAY | BUTTON_PREV) #define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN #define SOKOBAN_LEVEL_REPEAT BUTTON_POWER diff --git a/apps/plugins/star.c b/apps/plugins/star.c index fb4ea7a855..9f4e8f50a0 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -338,6 +338,7 @@ #define STAR_LEVEL_UP BUTTON_VOL_UP #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN #define STAR_LEVEL_REPEAT BUTTON_NEXT +#define STAR_TOGGLE_CONTROL_NAME "PLAY" #define STAR_QUIT_NAME "POWER" #define STAR_LEVEL_UP_NAME "VOL +" #define STAR_LEVEL_DOWN_NAME "VOL -" diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 3a0f71e836..c415cfb799 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -166,6 +166,24 @@ #define KBD_UP BUTTON_UP #define KBD_DOWN BUTTON_DOWN +#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD + +#define KBD_SELECT BUTTON_MENU +#define KBD_ABORT BUTTON_POWER +#define KBD_LEFT BUTTON_LEFT +#define KBD_RIGHT BUTTON_RIGHT +#define KBD_UP BUTTON_UP +#define KBD_DOWN BUTTON_DOWN + +#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD + +#define KBD_SELECT BUTTON_MENU +#define KBD_ABORT BUTTON_POWER +#define KBD_LEFT BUTTON_PREV +#define KBD_RIGHT BUTTON_NEXT +#define KBD_UP BUTTON_UP +#define KBD_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD #define KBD_SELECT BUTTON_PLAY -- cgit