correct overlooked POWER<->A swaps for gigabeat plugins (thanks to Firestorm ZERO for reporting) and button fix for blackjack on mr100

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

4 files changed, 27 insertions, 11 deletions

diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 0ab82df4f0..7d69e8f602 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -146,8 +146,8 @@ PLUGIN_HEADER
 #define BJACK_LEFT       BUTTON_LEFT
 
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
-#define BJACK_START      BUTTON_POWER
-#define BJACK_QUIT       BUTTON_A
+#define BJACK_START      BUTTON_A
+#define BJACK_QUIT       BUTTON_POWER
 #define BJACK_MAX        BUTTON_VOL_UP
 #define BJACK_MIN        BUTTON_VOL_DOWN
 #define BJACK_HIT        BUTTON_VOL_UP
@@ -228,7 +228,7 @@ PLUGIN_HEADER
 #define BJACK_MIN        BUTTON_DISPLAY
 #define BJACK_HIT        BUTTON_MENU
 #define BJACK_STAY       BUTTON_DISPLAY
-#define BJACK_DOUBLEDOWN BUTTON_SELECT
+#define BJACK_DOUBLEDOWN BUTTON_DOWN
 #define BJACK_SCORES     BUTTON_RIGHT
 #define BJACK_RESUME     BUTTON_PLAY
 #define BJACK_UP         BUTTON_UP
@@ -1183,8 +1183,8 @@ static unsigned int blackjack_menu(struct game_context* bj) {
             rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
             rb->lcd_puts(0, 9, str);
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
-            rb->lcd_puts(0, 2, "POWER to start");
-            rb->lcd_puts(0, 3, "A to exit");
+            rb->lcd_puts(0, 2, "A to start");
+            rb->lcd_puts(0, 3, "POWER to exit");
             rb->lcd_puts(0, 4, "VOL+ to hit");
             rb->lcd_puts(0, 5, "VOL- to stay");
             rb->lcd_puts(0, 6, "CENTER to double down");
@@ -1192,6 +1192,16 @@ static unsigned int blackjack_menu(struct game_context* bj) {
             rb->lcd_puts(0, 8, "MENU to save/resume");
             rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
             rb->lcd_puts(0, 9, str);
+#elif CONFIG_KEYPAD == MROBE100_PAD
+            rb->lcd_puts(0, 2, "CENTER to start");
+            rb->lcd_puts(0, 3, "POWER to exit");
+            rb->lcd_puts(0, 4, "MENU to hit");
+            rb->lcd_puts(0, 5, "DISPLAY to stay");
+            rb->lcd_puts(0, 6, "DOWN to double down");
+            rb->lcd_puts(0, 6, "RIGHT to view highscores ");
+            rb->lcd_puts(0, 8, "PLAY to save/resume");
+            rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
+            rb->lcd_puts(0, 9, str);
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD)
             rb->lcd_puts(0, 2, "SELECT to start & to hit");
             rb->lcd_puts(0, 3, "POWER to exit");
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c
index 8a4a629669..2b63be90e7 100644
--- a/apps/plugins/matrix.c
+++ b/apps/plugins/matrix.c
@@ -73,7 +73,7 @@ extern const fb_data matrix_normal[];
 #define MATRIX_SLEEP_LESS BUTTON_DOWN
 #define MATRIX_PAUSE BUTTON_PLAY
 #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
-#define MATRIX_EXIT BUTTON_A
+#define MATRIX_EXIT BUTTON_POWER
 #define MATRIX_SLEEP_MORE BUTTON_UP
 #define MATRIX_SLEEP_LESS BUTTON_DOWN
 #define MATRIX_PAUSE BUTTON_SELECT
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c
index 387a180828..35ce9daa83 100644
--- a/apps/plugins/plasma.c
+++ b/apps/plugins/plasma.c
@@ -63,7 +63,7 @@ static int plasma_frequency;
 #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK
 
 #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
-#define PLASMA_QUIT BUTTON_A
+#define PLASMA_QUIT BUTTON_POWER
 #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
 #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
 
diff --git a/manual/plugins/blackjack.tex b/manual/plugins/blackjack.tex
index cbf2ceff58..6e9ecb1eeb 100644
--- a/manual/plugins/blackjack.tex
+++ b/manual/plugins/blackjack.tex
@@ -17,15 +17,17 @@ visit\\
     \multicolumn{2}{c}{\textbf{In menu}}\\\hline
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} 
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect}
     \opt{ONDIO_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD}{\ButtonA}
     & Start new game\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonRight}
     \opt{SANSA_E200_PAD}{\ButtonRec}
-    \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD}{\ButtonMenu}
+    \opt{MROBE100_PAD}{\ButtonPlay}
         & Resume saved game\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
     \opt{RECORDER_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonRight}
@@ -50,18 +52,21 @@ visit\\
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
     \opt{ONDIO_PAD}{\ButtonLeft}
     \opt{GIGABEAT_PAD}{\ButtonVolUp}
+    \opt{MR100_PAD}{\ButtonMenu}
     & Hit (Draw new card)\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H10_PAD}{\ButtonFF} 
     \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD}{\ButtonVolDown}
+    \opt{MROBE100_PAD}{\ButtonDisplay}
     & Stay (End hand)\\
     \opt{RECORDER_PAD}{\ButtonFThree}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonRew} 
     \opt{ONDIO_PAD}{\ButtonUp}
+    \opt{MR100_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonLeft}
     & Double down\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
@@ -69,7 +74,8 @@ visit\\
     \opt{ONDIO_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD}{\ButtonDown}
     \opt{IRIVER_H10_PAD}{\ButtonRight}
     \opt{SANSA_E200_PAD}{\ButtonRec}
-    \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonMenu}
+    \opt{GIGABEAT_PAD}{\ButtonMenu}
+    \opt{MROBE100_PAD}{\ButtonPlay}
         & Save game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}