4 files changed, 42 insertions, 0 deletions

diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index 11e415867e..f47889b08b 100755
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -116,6 +116,16 @@ PLUGIN_HEADER
 #define BUBBLES_SELECT BUTTON_UP
 #define BUBBLES_RESUME BUTTON_DOWN
 
+#elif CONFIG_KEYPAD == IRIVER_H10_PAD
+#define BUBBLES_LEFT   BUTTON_LEFT
+#define BUBBLES_RIGHT  BUTTON_RIGHT
+#define BUBBLES_UP     BUTTON_SCROLL_UP
+#define BUBBLES_DOWN   BUTTON_SCROLL_DOWN
+#define BUBBLES_QUIT   BUTTON_POWER
+#define BUBBLES_START  BUTTON_PLAY
+#define BUBBLES_SELECT BUTTON_REW
+#define BUBBLES_RESUME BUTTON_FF
+
 #else
     #error BUBBLES: Unsupported keypad
 #endif
diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c
index 321a1b4b31..e8d6385cbe 100644
--- a/apps/plugins/disktidy.c
+++ b/apps/plugins/disktidy.c
@@ -83,6 +83,12 @@ enum tidy_system
 #define TIDY_LEFT BUTTON_LEFT
 #define TIDY_RIGHT BUTTON_RIGHT
 
+#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
+#define TIDY_DO BUTTON_PLAY
+#define TIDY_STOP BUTTON_POWER
+#define TIDY_LEFT BUTTON_LEFT
+#define TIDY_RIGHT BUTTON_RIGHT
+
 #else
   #error DISKTIDY: Unsupported keypad
 #endif
@@ -374,6 +380,9 @@ void tidy_lcd_menu(enum tidy_system system)
 #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
     rb->lcd_puts(0, 0, "[Select] to clean up");
     rb->lcd_puts(0, 1, "[A] to exit/abort");
+#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
+    rb->lcd_puts(0, 0, "[Play] to clean up");
+    rb->lcd_puts(0, 1, "[Power] to exit/abort");
 #else
     #error DISKTIDY: Unsupported model
 #endif
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 7a5bff4d6c..c27d6aa120 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -67,6 +67,10 @@ extern vo_open_t vo_rockbox_open;
 #define MPEG_STOP       BUTTON_A
 #define MPEG_PAUSE      BUTTON_SELECT
 
+#elif CONFIG_KEYPAD == IRIVER_H10_PAD
+#define MPEG_STOP       BUTTON_POWER
+#define MPEG_PAUSE      BUTTON_PLAY
+
 #else
 #error MPEGPLAYER: Unsupported keypad
 #endif
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 26830a6b3d..5f7af73861 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -173,6 +173,25 @@ static struct plugin_api* rb;
 #   define HK_CUR2STACK    "SELECT.."
 #   define HK_REM2STACK    "POWER+RIGHT"
 
+#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
+#define SOL_QUIT BUTTON_POWER
+#define SOL_UP BUTTON_SCROLL_UP
+#define SOL_DOWN BUTTON_SCROLL_DOWN
+#define SOL_LEFT BUTTON_LEFT
+#define SOL_RIGHT BUTTON_RIGHT
+#define SOL_MOVE BUTTON_REW
+#define SOL_DRAW BUTTON_PLAY
+#define SOL_REM2CUR (BUTTON_FF | BUTTON_LEFT)
+#define SOL_CUR2STACK (BUTTON_FF | BUTTON_SCROLL_UP)
+#define SOL_REM2STACK (BUTTON_FF | BUTTON_SCROLL_DOWN)
+#define SOL_MENU_RUN BUTTON_REW
+#define SOL_MENU_INFO BUTTON_PLAY
+#define HK_MOVE "REW"
+#define HK_DRAW "PLAY"
+#define HK_REM2CUR "REW+LEFT"
+#define HK_CUR2STACK "REW+UP.."
+#define HK_REM2STACK "REW+DOWN"
+
 #else
 #   error "Unknown keypad"
 #endif