2 files changed, 52 insertions, 7 deletions

diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index bdae8d2b0c..f07bf861b4 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -20,12 +20,8 @@ chessbox
 jpeg
 sudoku
 reversi
-/* Exclude targets without keypads set or with not enough plugin buffer.
-   Plugin is about 40k, rounding up to 65k to be safe. */
-#if (CONFIG_KEYPAD != SANSA_CLIP_PAD && CONFIG_KEYPAD != SANSA_M200_PAD && \
-     CONFIG_KEYPAD != CREATIVEZVM_PAD && CONFIG_KEYPAD != CREATIVEZV_PAD && \
-     CONFIG_KEYPAD != PHILIPS_HDD1630_PAD && defined(PLUGIN_BUFFER_SIZE) && \
-     PLUGIN_BUFFER_SIZE >= 0x10000)
+/* Plugin is about 40k, rounding up to 65k to be safe. */
+#if (defined(PLUGIN_BUFFER_SIZE) && PLUGIN_BUFFER_SIZE >= 0x10000)
 goban
 #endif
 #ifndef OLYMPUS_MROBE_500
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index c15eead13b..9e9dc73d91 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -100,7 +100,7 @@
 #define  GBN_BUTTON_MENU               BUTTON_POWER
 #define  GBN_BUTTON_PLAY               BUTTON_SELECT | BUTTON_REL
 #define  GBN_BUTTON_CONTEXT            BUTTON_SELECT | BUTTON_REPEAT
-/* no next var */
+#define  GBN_BUTTON_NEXT_VAR           BUTTON_HOME
 
 #elif (CONFIG_KEYPAD == SANSA_C200_PAD)
 #define  GBN_BUTTON_UP                 BUTTON_UP
@@ -114,6 +114,55 @@
 #define  GBN_BUTTON_CONTEXT            BUTTON_SELECT | BUTTON_REPEAT
 #define  GBN_BUTTON_NEXT_VAR           BUTTON_REC
 
+#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD)
+#define  GBN_BUTTON_UP                 BUTTON_UP
+#define  GBN_BUTTON_DOWN               BUTTON_DOWN
+#define  GBN_BUTTON_LEFT               BUTTON_LEFT
+#define  GBN_BUTTON_RIGHT              BUTTON_RIGHT
+#define  GBN_BUTTON_RETREAT            BUTTON_VOL_DOWN
+#define  GBN_BUTTON_ADVANCE            BUTTON_VOL_UP
+#define  GBN_BUTTON_MENU               BUTTON_POWER
+#define  GBN_BUTTON_PLAY               BUTTON_SELECT | BUTTON_REL
+#define  GBN_BUTTON_CONTEXT            BUTTON_SELECT | BUTTON_REPEAT
+#define  GBN_BUTTON_NEXT_VAR           BUTTON_HOME
+
+#elif (CONFIG_KEYPAD == SANSA_M200_PAD)
+#define  GBN_BUTTON_UP                 BUTTON_UP
+#define  GBN_BUTTON_DOWN               BUTTON_DOWN
+#define  GBN_BUTTON_LEFT               BUTTON_LEFT
+#define  GBN_BUTTON_RIGHT              BUTTON_RIGHT
+#define  GBN_BUTTON_RETREAT            BUTTON_VOL_DOWN
+#define  GBN_BUTTON_ADVANCE            BUTTON_VOL_UP
+#define  GBN_BUTTON_MENU               BUTTON_POWER
+#define  GBN_BUTTON_PLAY               BUTTON_SELECT | BUTTON_REL
+#define  GBN_BUTTON_CONTEXT            BUTTON_SELECT | BUTTON_REPEAT
+/* No next var */
+
+#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD) \
+   || (CONFIG_KEYPAD == CREATIVEZV_PAD)
+#define  GBN_BUTTON_UP                 BUTTON_UP
+#define  GBN_BUTTON_DOWN               BUTTON_DOWN
+#define  GBN_BUTTON_LEFT               BUTTON_LEFT
+#define  GBN_BUTTON_RIGHT              BUTTON_RIGHT
+#define  GBN_BUTTON_RETREAT            BUTTON_BACK
+#define  GBN_BUTTON_ADVANCE            BUTTON_CUSTOM
+#define  GBN_BUTTON_MENU               BUTTON_MENU
+#define  GBN_BUTTON_PLAY               BUTTON_SELECT | BUTTON_REL
+#define  GBN_BUTTON_CONTEXT            BUTTON_SELECT | BUTTON_REPEAT
+#define  GBN_BUTTON_NEXT_VAR           BUTTON_PLAY
+
+#elif (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)
+#define  GBN_BUTTON_UP                 BUTTON_UP
+#define  GBN_BUTTON_DOWN               BUTTON_DOWN
+#define  GBN_BUTTON_LEFT               BUTTON_LEFT
+#define  GBN_BUTTON_RIGHT              BUTTON_RIGHT
+#define  GBN_BUTTON_RETREAT            BUTTON_VOL_DOWN
+#define  GBN_BUTTON_ADVANCE            BUTTON_VOL_UP
+#define  GBN_BUTTON_MENU               BUTTON_MENU
+#define  GBN_BUTTON_PLAY               BUTTON_SELECT | BUTTON_REL
+#define  GBN_BUTTON_CONTEXT            BUTTON_SELECT | BUTTON_REPEAT
+#define  GBN_BUTTON_NEXT_VAR           BUTTON_VIEW
+
 #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
 #define  GBN_BUTTON_UP                 BUTTON_UP
 #define  GBN_BUTTON_DOWN               BUTTON_DOWN