New port: AIGO EROS Q / EROS K

The Q and K have a slightly different case, but the hardware under the
shell is completely identical.

These models are rebadged versions:

 * Hifiwalker H2   (== Q)
 * AGPTek H3       (== K)
 * Surfans F20     (== K)

Other notes:

  * Significant improvements in the shared Hiby-platform launcher/loader
    * SD card can theoretically be hot-swapped now
    * Support external USB mass storage!
  * Some consolidation of Hiby-platform targets
  * Some consolidation of plugin keymaps

Todo/known issues:

 * Keymaps need to be gone over properly
 * Convert to HAVE_SCROLLWHEEL?

Change-Id: I5a8a4f22c38a5b69392ca7c0a8ad8c4e07d9523c

1 files changed, 20 insertions, 33 deletions

diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 1547e52573..0a2348a28d 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -45,9 +45,9 @@
 #define REVERSI_BUTTON_LEFT (BUTTON_LEFT | BUTTON_SCROLL_BACK)
 #define REVERSI_BUTTON_RIGHT (BUTTON_RIGHT | BUTTON_SCROLL_FWD)
 #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT
-#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS 
+#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS
 #define REVERSI_BUTTON_MENU BUTTON_SELECT
-#define REVERSI_BUTTON_MENU_LONGPRESS 
+#define REVERSI_BUTTON_MENU_LONGPRESS
 
 #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
 #define REVERSI_BUTTON_QUIT BUTTON_POWER
@@ -96,9 +96,9 @@
 #define REVERSI_BUTTON_LEFT BUTTON_LEFT
 #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT
 #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT
-#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS 
+#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS
 #define REVERSI_BUTTON_MENU BUTTON_SELECT
-#define REVERSI_BUTTON_MENU_LONGPRESS 
+#define REVERSI_BUTTON_MENU_LONGPRESS
 
 #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
 #define REVERSI_BUTTON_QUIT (BUTTON_HOME|BUTTON_REPEAT)
@@ -107,9 +107,9 @@
 #define REVERSI_BUTTON_LEFT BUTTON_LEFT
 #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT
 #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT
-#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS 
+#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS
 #define REVERSI_BUTTON_MENU BUTTON_SELECT
-#define REVERSI_BUTTON_MENU_LONGPRESS 
+#define REVERSI_BUTTON_MENU_LONGPRESS
 
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define REVERSI_BUTTON_QUIT BUTTON_POWER
@@ -233,17 +233,17 @@
 #define REVERSI_BUTTON_UP BUTTON_REW
 #define REVERSI_BUTTON_DOWN BUTTON_FF
 #define REVERSI_BUTTON_LEFT BUTTON_VOL_DOWN
-#define REVERSI_BUTTON_RIGHT BUTTON_VOL_UP 
+#define REVERSI_BUTTON_RIGHT BUTTON_VOL_UP
 #define REVERSI_BUTTON_MAKE_MOVE BUTTON_FUNC
-#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS 
+#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS
 #define REVERSI_BUTTON_MENU BUTTON_FUNC
-#define REVERSI_BUTTON_MENU_LONGPRESS 
+#define REVERSI_BUTTON_MENU_LONGPRESS
 
 #elif CONFIG_KEYPAD == MPIO_HD300_PAD
 #define REVERSI_BUTTON_UP BUTTON_UP
 #define REVERSI_BUTTON_DOWN BUTTON_DOWN
 #define REVERSI_BUTTON_LEFT BUTTON_REW
-#define REVERSI_BUTTON_RIGHT BUTTON_FF 
+#define REVERSI_BUTTON_RIGHT BUTTON_FF
 #define REVERSI_BUTTON_MAKE_MOVE BUTTON_ENTER
 #define REVERSI_BUTTON_MENU BUTTON_MENU
 
@@ -251,7 +251,7 @@
 #define REVERSI_BUTTON_UP BUTTON_UP
 #define REVERSI_BUTTON_DOWN BUTTON_DOWN
 #define REVERSI_BUTTON_LEFT BUTTON_LEFT
-#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT 
+#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT
 #define REVERSI_BUTTON_MAKE_MOVE BUTTON_PLAYPAUSE
 #define REVERSI_BUTTON_MENU BUTTON_BACK
 
@@ -269,7 +269,7 @@
 #define REVERSI_BUTTON_UP BUTTON_UP
 #define REVERSI_BUTTON_DOWN BUTTON_DOWN
 #define REVERSI_BUTTON_LEFT BUTTON_LEFT
-#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT 
+#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT
 #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT
 #define REVERSI_BUTTON_MENU BUTTON_POWER
 
@@ -319,18 +319,7 @@
 #define REVERSI_BUTTON_MENU        BUTTON_PLAY
 #define REVERSI_BUTTON_MENU_LONGPRESS
 
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define REVERSI_BUTTON_QUIT        BUTTON_POWER
-#define REVERSI_BUTTON_UP          BUTTON_HOME
-#define REVERSI_BUTTON_DOWN        BUTTON_OPTION
-#define REVERSI_BUTTON_LEFT        BUTTON_PREV
-#define REVERSI_BUTTON_RIGHT       BUTTON_NEXT
-#define REVERSI_BUTTON_MAKE_MOVE   BUTTON_PLAY
-#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS
-#define REVERSI_BUTTON_MENU        BUTTON_PLAY
-#define REVERSI_BUTTON_MENU_LONGPRESS
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 #define REVERSI_BUTTON_QUIT        BUTTON_POWER
 #define REVERSI_BUTTON_UP          BUTTON_HOME
 #define REVERSI_BUTTON_DOWN        BUTTON_OPTION
@@ -352,27 +341,25 @@
 #define REVERSI_BUTTON_MENU        BUTTON_PLAY
 #define REVERSI_BUTTON_MENU_LONGPRESS
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 #define REVERSI_BUTTON_QUIT        BUTTON_POWER
 #define REVERSI_BUTTON_UP          BUTTON_PREV
 #define REVERSI_BUTTON_DOWN        BUTTON_NEXT
 #define REVERSI_BUTTON_LEFT        BUTTON_PREV
 #define REVERSI_BUTTON_RIGHT       BUTTON_VOL_DOWN
 #define REVERSI_BUTTON_MAKE_MOVE   BUTTON_PLAY
-#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS 
+#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS
 #define REVERSI_BUTTON_MENU        BUTTON_PLAY
-#define REVERSI_BUTTON_MENU_LONGPRESS 
+#define REVERSI_BUTTON_MENU_LONGPRESS
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
 #define REVERSI_BUTTON_QUIT        BUTTON_POWER
 #define REVERSI_BUTTON_UP          BUTTON_PREV
 #define REVERSI_BUTTON_DOWN        BUTTON_NEXT
-#define REVERSI_BUTTON_LEFT        BUTTON_PREV
-#define REVERSI_BUTTON_RIGHT       BUTTON_VOL_DOWN
+#define REVERSI_BUTTON_LEFT        BUTTON_SCROLL_BACK
+#define REVERSI_BUTTON_RIGHT       BUTTON_SCROLL_FWD
 #define REVERSI_BUTTON_MAKE_MOVE   BUTTON_PLAY
-#define REVERSI_BUTTON_MAKE_MOVE_SHORTPRESS 
-#define REVERSI_BUTTON_MENU        BUTTON_PLAY
-#define REVERSI_BUTTON_MENU_LONGPRESS 
+#define REVERSI_BUTTON_MENU        BUTTON_MENU
 
 #else
 #error No keymap defined!