7 files changed, 74 insertions, 2 deletions

diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index ba28808e65..3197a45eb8 100644
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -137,7 +137,7 @@ enum {
 #define XOFS          64
 #define MAX_FPS       30
 
-/* 16x16 bubbles (H300, iPod Color) */
+/* 16x16 bubbles (H300, iPod Color, HDD6330) */
 #elif (LCD_HEIGHT == 176) && (LCD_WIDTH == 220)
 #define XOFS          46
 #define MAX_FPS       30
@@ -164,11 +164,18 @@ enum {
 #define XOFS          40
 #define MAX_FPS       40
 
-/* 12x12 bubbles (H100, H10, iAudio X5, iPod 3G, iPod 4G grayscale) */
+/* 12x12 bubbles (H100, H10, iAudio X5, HDD1630, iPod 3G, iPod 4G grayscale) */
 #elif (LCD_HEIGHT == 128) && ((LCD_WIDTH == 160) || (LCD_WIDTH == 128))
 #define XOFS          33
 #define MAX_FPS       30
 
+/* 12x12 bubbles (GoGear SA9200) */
+#elif (LCD_HEIGHT == 160) && (LCD_WIDTH == 128)
+#define XOFS          33
+#define ROW_HEIGHT    10
+#define ROW_INDENT     6
+#define MAX_FPS       30
+
 /* 10x10 bubbles (iPod Mini) */
 #elif (LCD_HEIGHT == 110) && (LCD_WIDTH == 138)
 #define XOFS          33
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index 7435518855..80611ab085 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1102,6 +1102,19 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define CHIP8_KEY8 BUTTON_DOWN
 #define CHIP8_KEY9 BUTTON_VIEW
 
+#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
+#define CHIP8_OFF  BUTTON_POWER
+#define CHIP8_KEY1 BUTTON_LEFT
+#define CHIP8_KEY2 BUTTON_UP
+#define CHIP8_KEY3 BUTTON_RIGHT
+#define CHIP8_KEY4 BUTTON_PREV
+#define CHIP8_KEY5 BUTTON_PLAY
+#define CHIP8_KEY6 BUTTON_NEXT
+#define CHIP8_KEY7 BUTTON_MENU
+#define CHIP8_KEY8 BUTTON_DOWN
+#define CHIP8_KEY9 BUTTON_VOL_UP
+#define CHIP8_KEY0 BUTTON_VOL_DOWN
+
 #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
 CONFIG_KEYPAD == ONDAVX777_PAD || \
 CONFIG_KEYPAD == MROBE500_PAD
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c
index 0613800421..be76a54250 100644
--- a/apps/plugins/mosaique.c
+++ b/apps/plugins/mosaique.c
@@ -147,6 +147,11 @@ PLUGIN_HEADER
 #define MOSAIQUE_SPEED BUTTON_VIEW
 #define MOSAIQUE_RESTART BUTTON_MENU
 
+#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
+#define MOSAIQUE_QUIT BUTTON_POWER
+#define MOSAIQUE_SPEED BUTTON_RIGHT
+#defien MOSAIQUE_RESTART BUTTON_MENU
+
 #elif CONFIG_KEYPAD == ONDAVX747_PAD
 #define MOSAIQUE_QUIT BUTTON_POWER
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index b58fcc587d..26d8414d8a 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -170,6 +170,16 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_SCROLL_UP   BUTTON_VOL_UP
 #define MPEG_START_TIME_EXIT        BUTTON_POWER
 
+#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
+#define MPEG_START_TIME_SELECT      BUTTON_PLAY
+#define MPEG_START_TIME_LEFT        BUTTON_PREV
+#define MPEG_START_TIME_RIGHT       BUTTON_NEXT
+#define MPEG_START_TIME_UP          BUTTON_UP
+#define MPEG_START_TIME_DOWN        BUTTON_DOWN
+#define MPEG_START_TIME_SCROLL_DOWN BUTTON_VOL_DOWN
+#define MPEG_START_TIME_SCROLL_UP   BUTTON_VOL_UP
+#define MPEG_START_TIME_EXIT        BUTTON_POWER
+
 #elif CONFIG_KEYPAD == ONDAVX747_PAD
 #define MPEG_START_TIME_EXIT        BUTTON_POWER
 
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 7c52a47260..31b7c68373 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -279,6 +279,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define MPEG_RW         BUTTON_LEFT
 #define MPEG_FF         BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
+#define MPEG_MENU       BUTTON_MENU
+#define MPEG_STOP       BUTTON_POWER
+#define MPEG_PAUSE      BUTTON_PLAY
+#define MPEG_VOLDOWN    BUTTON_VOL_DOWN
+#define MPEG_VOLUP      BUTTON_VOL_UP
+#define MPEG_RW         BUTTON_UP
+#define MPEG_FF         BUTTON_DOWN
+
 #elif CONFIG_KEYPAD == ONDAVX747_PAD
 #define MPEG_MENU       (BUTTON_MENU|BUTTON_REL)
 //#define MPEG_STOP       BUTTON_POWER
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index fa5a7623c0..1d081f48d5 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -230,6 +230,16 @@ static void setoptions (void)
         options.SELECT=BUTTON_SELECT;
         options.MENU=BUTTON_MENU;
 
+#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
+        options.UP=BUTTON_UP;
+        options.DOWN=BUTTON_DOWN;
+
+        options.A=BUTTON_VOL_UP;
+        options.B=BUTTON_VOL_DOWN;
+        options.START=BUTTON_RIGHT;
+        options.SELECT=BUTTON_LEFT;
+        options.MENU=BUTTON_MENU;
+
 #elif CONFIG_KEYPAD == ONDAVX747_PAD
         options.A=BUTTON_VOL_UP;
         options.B=BUTTON_VOL_DOWN;
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 2fdba18610..09407996c4 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -395,6 +395,24 @@ PLUGIN_HEADER
 #   define HK_CUR2STACK    "SELECT.."
 #   define HK_REM2STACK    "VIEW+RIGHT"
 
+#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
+#   define SOL_QUIT          BUTTON_POWER
+#   define SOL_UP            BUTTON_UP
+#   define SOL_DOWN          BUTTON_DOWN
+#   define SOL_LEFT          BUTTON_PREV
+#   define SOL_RIGHT         BUTTON_NEXT
+#   define SOL_MOVE_PRE      BUTTON_PLAY
+#   define SOL_MOVE          (BUTTON_PLAY | BUTTON_REL)
+#   define SOL_DRAW          BUTTON_MENU
+#   define SOL_REM2CUR       BUTTON_LEFT
+#   define SOL_CUR2STACK     (BUTTON_PLAY | BUTTON_REPEAT)
+#   define SOL_REM2STACK     BUTTON_RIGHT
+#   define HK_MOVE           "PLAY"
+#   define HK_DRAW           "MENU"
+#   define HK_REM2CUR        "LEFT"
+#   define HK_CUR2STACK      "PLAY..."
+#   define REM2STACK         "RIGHT"
+
 #elif (CONFIG_KEYPAD == ONDAVX747_PAD) || \
 (CONFIG_KEYPAD == ONDAVX777_PAD) || \
 CONFIG_KEYPAD == MROBE500_PAD