9 files changed, 81 insertions, 4 deletions

diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 1cd28bed8c..f7cda90eb4 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -346,6 +346,22 @@ enum {
 #define BJACK_RIGHT         BUTTON_RIGHT
 #define BJACK_LEFT          BUTTON_LEFT
 
+#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
+#define BJACK_SELECT_NAME   "PLAY"
+#define BJACK_STAY_NAME     "VOL-"
+#define BJACK_QUIT_NAME     "POWER"
+#define BJACK_DOUBLE_NAME   "MENU"
+#define BJACK_SELECT        BUTTON_PLAY
+#define BJACK_QUIT          BUTTON_POWER
+#define BJACK_MAX           BUTTON_VOL_UP
+#define BJACK_MIN           BUTTON_VOL_DOWN
+#define BJACK_STAY          BUTTON_VOL_DOWN
+#define BJACK_DOUBLEDOWN    BUTTON_MENU
+#define BJACK_UP            BUTTON_UP
+#define BJACK_DOWN          BUTTON_DOWN
+#define BJACK_RIGHT         BUTTON_RIGHT
+#define BJACK_LEFT          BUTTON_LEFT
+
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 #define BJACK_SELECT_NAME   "MENU"
 #define BJACK_STAY_NAME     "VOL-"
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index b895a4f864..9cca99adbe 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -181,6 +181,15 @@ GREY_INFO_STRUCT
 #   define FFT_FREQ_SCALE   BUTTON_DOWN
 #   define FFT_QUIT         BUTTON_POWER
 
+#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
+#   define FFT_PREV_GRAPH   BUTTON_PREV
+#   define FFT_NEVT_GRAPH   BUTTON_NEXT
+#   define FFT_ORIENTATION  BUTTON_PLAY
+#   define FFT_WINDOW       BUTTON_MENU
+#   define FFT_AMP_SCALE    BUTTON_UP
+#   define FFT_FREQ_SCALE   BUTTON_DOWN
+#   define FFT_QUIT         BUTTON_POWER
+
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 #   define FFT_PREV_GRAPH   BUTTON_PREV
 #   define FFT_NEXT_GRAPH   BUTTON_NEXT
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h
index df58bef8c1..3ca50485f0 100644
--- a/apps/plugins/fractals/fractal.h
+++ b/apps/plugins/fractals/fractal.h
@@ -276,6 +276,18 @@
 #define FRACTAL_PRECISION_DEC   BUTTON_VOL_DOWN
 #define FRACTAL_RESET           BUTTON_MENU
 
+#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
+#define FRACTAL_QUIT            BUTTON_POWER
+#define FRACTAL_UP              BUTTON_UP
+#define FRACTAL_DOWN            BUTTON_DOWN
+#define FRACTAL_LEFT            BUTTON_PREV
+#define FRACTAL_RIGHT           BUTTON_NEXT
+#define FRACTAL_ZOOM_IN         BUTTON_RIGHT
+#define FRACTAL_ZOOM_OUT        BUTTON_LEFT
+#define FRACTAL_PRECISION_INC   BUTTON_VOL_UP
+#define FRACTAL_PRECISION_DEC   BUTTON_VOL_DOWN
+#define FRACTAL_RESET           BUTTON_MENU
+
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 #define FRACTAL_QUIT            BUTTON_POWER
 #define FRACTAL_UP              BUTTON_UP
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index b84c3653d1..480cf9d5e2 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -179,6 +179,13 @@
 #define RIGHT BUTTON_RIGHT
 #define FIRE BUTTON_SELECT
 
+#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
+
+#define QUIT BUTTON_POWER
+#define LEFT BUTTON_LEFT
+#define RIGHT BUTTON_RIGHT
+#define FIRE BUTTON_PLAY
+
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 
 #define QUIT BUTTON_POWER
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index 218395027e..71267484b1 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -237,6 +237,16 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define HK_SELECT "SELECT"
 #define HK_CANCEL "POWER"
 
+#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
+#define JEWELS_UP     BUTTON_UP
+#define JEWELS_DOWN   BUTTON_DOWN
+#define JEWELS_LEFT   BUTTON_LEFT
+#define JEWELS_RIGHT  BUTTON_RIGHT
+#define JEWELS_SELECT BUTTON_PLAY
+#define JEWELS_CANCEL BUTTON_POWER
+#define HK_SELECT "PLAY"
+#define HK_CANCEL "POWER"
+
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 #define JEWELS_UP     BUTTON_UP
 #define JEWELS_DOWN   BUTTON_DOWN
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index 93b6e7c278..9697b9821f 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -180,6 +180,14 @@
 #define PONG_RIGHT_UP BUTTON_VOL_UP
 #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN
 
+#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
+#define PONG_QUIT BUTTON_POWER
+#define PONG_PAUSE BUTTON_MENU
+#define PONG_LEFT_UP BUTTON_UP
+#define PONG_LEFT_DOWN BUTTON_DOWN
+#define PONG_RIGHT_UP BUTTON_VOL_UP
+#define PONG_RIGHT_DOWN BUTTON_VOL_DOWN
+
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 #define PONG_QUIT BUTTON_POWER
 #define PONG_PAUSE BUTTON_MENU
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 2bab546fa0..ae9c922342 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -287,6 +287,18 @@
 #define ROCKBLOX_DROP          BUTTON_SELECT
 #define ROCKBLOX_RESTART       BUTTON_MENU
 
+#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
+
+#define ROCKBLOX_OFF           BUTTON_POWER
+#define ROCKBLOX_ROTATE_CCW    BUTTON_PREV
+#define ROCKBLOX_ROTATE_CW     BUTTON_NEXT
+#define ROCKBLOX_ROTATE        BUTTON_UP
+#define ROCKBLOX_DOWN          BUTTON_DOWN
+#define ROCKBLOX_LEFT          BUTTON_LEFT
+#define ROCKBLOX_RIGHT         BUTTON_RIGHT
+#define ROCKBLOX_DROP          BUTTON_PLAY
+#define ROCKBLOX_RESTART       BUTTON_MENU
+
 # elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 
 #define ROCKBLOX_OFF           BUTTON_POWER
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c
index a39da86ec1..af9c0ab16d 100644
--- a/apps/plugins/rockblox1d.c
+++ b/apps/plugins/rockblox1d.c
@@ -96,6 +96,10 @@
 #define ONEDROCKBLOX_DOWN              BUTTON_SELECT
 #define ONEDROCKBLOX_QUIT              BUTTON_POWER
 
+#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
+#define ONEDROCKBLOX_DOWN              BUTTON_PLAY
+#define ONEDROCKBLOX_QUIT              BUTTON_POWER
+
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 #define ONEDROCKBLOX_DOWN              BUTTON_PLAY
 #define ONEDROCKBLOX_QUIT              BUTTON_POWER
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index 6a70a47ec4..fbc00d3902 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -91,10 +91,9 @@ static bool cancel;
 #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
 #define STATS_STOP BUTTON_BACK
 
-#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
-#define STATS_STOP BUTTON_POWER
-
-#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
+#elif (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
+(CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \
+(CONFIG_KEYPAD == PHILIPS_SA9200_PAD)
 #define STATS_STOP BUTTON_POWER
 
 #elif CONFIG_KEYPAD == ONDAVX747_PAD