D2/Touchscreen keymap improvements: onscreen keyboard is now usable; PLAY/pause now mapped to TOPRIGHT; Usable defaults in Rockboy.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18529 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 9 insertions, 3 deletions

diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 1de2c2f..1addef2 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -193,6 +193,7 @@ static void setoptions (void)
         options.START=BUTTON_REW;
         options.SELECT=BUTTON_NONE;
         options.MENU=BUTTON_POWER;
+        
 #elif CONFIG_KEYPAD == MROBE500_PAD
         options.UP=BUTTON_RC_PLAY;
         options.DOWN=BUTTON_RC_DOWN;
@@ -204,7 +205,11 @@ static void setoptions (void)
         options.START=BUTTON_RC_HEART;
         options.SELECT=BUTTON_RC_MODE;
         options.MENU=BUTTON_POWER;
+
 #elif CONFIG_KEYPAD == COWOND2_PAD
+        options.A=BUTTON_PLUS;
+        options.B=BUTTON_MINUS;
+        options.MENU=BUTTON_MENU;
 
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
         options.UP=BUTTON_UP;
@@ -222,13 +227,14 @@ static void setoptions (void)
 #ifdef HAVE_TOUCHSCREEN
         options.UP=BUTTON_TOPMIDDLE;
         options.DOWN=BUTTON_BOTTOMMIDDLE;
-
-        options.A=BUTTON_MIDLEFT;
-        options.B=BUTTON_MIDRIGHT;
         options.START=BUTTON_TOPRIGHT;
         options.SELECT=BUTTON_CENTER;
+#if CONFIG_KEYPAD != COWOND2_PAD
+        options.A=BUTTON_BOTTOMLEFT;
+        options.B=BUTTON_BOTTOMRIGHT;
         options.MENU=BUTTON_TOPLEFT;
 #endif
+#endif
 
       options.maxskip=4;
       options.fps=0;