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, 8 insertions, 23 deletions

diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 5872973a45..11c0e86619 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -382,20 +382,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define MINESWP_DISCOVER2  BUTTON_VOL_UP
 #   define MINESWP_INFO       (BUTTON_PLAY | BUTTON_OPTION)
 
-#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD)
-#   define MINESWP_LEFT       BUTTON_PREV
-#   define MINESWP_RIGHT      BUTTON_NEXT
-#   define MINESWP_UP         BUTTON_HOME
-#   define MINESWP_DOWN       BUTTON_OPTION
-#   define MINESWP_QUIT       BUTTON_POWER
-#   define MINESWP_TOGGLE_PRE BUTTON_PLAY
-#   define MINESWP_TOGGLE     (BUTTON_PLAY | BUTTON_REL)
-#   define MINESWP_TOGGLE2    BUTTON_VOL_DOWN
-#   define MINESWP_DISCOVER   (BUTTON_PLAY | BUTTON_REPEAT)
-#   define MINESWP_DISCOVER2  BUTTON_VOL_UP
-#   define MINESWP_INFO       (BUTTON_PLAY | BUTTON_OPTION)
-
-#elif (CONFIG_KEYPAD == XDUOO_X20_PAD)
+#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD) || (CONFIG_KEYPAD == XDUOO_X20_PAD)
 #   define MINESWP_LEFT       BUTTON_PREV
 #   define MINESWP_RIGHT      BUTTON_NEXT
 #   define MINESWP_UP         BUTTON_HOME
@@ -421,7 +408,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define MINESWP_DISCOVER2  BUTTON_VOL_UP
 #   define MINESWP_INFO       (BUTTON_PLAY | BUTTON_OPTION)
 
-#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD)
 #   define MINESWP_LEFT       BUTTON_HOME
 #   define MINESWP_RIGHT      BUTTON_VOL_DOWN
 #   define MINESWP_UP         BUTTON_PREV
@@ -434,18 +421,16 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define MINESWP_DISCOVER2  (BUTTON_POWER | BUTTON_VOL_DOWN)
 #   define MINESWP_INFO       (BUTTON_POWER | BUTTON_HOME)
 
-#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
-#   define MINESWP_LEFT       BUTTON_HOME
-#   define MINESWP_RIGHT      BUTTON_VOL_DOWN
+#elif (CONFIG_KEYPAD == EROSQ_PAD)
+#   define MINESWP_LEFT       BUTTON_SCROLL_BACK
+#   define MINESWP_RIGHT      BUTTON_SCROLL_FWD
 #   define MINESWP_UP         BUTTON_PREV
 #   define MINESWP_DOWN       BUTTON_NEXT
 #   define MINESWP_QUIT       BUTTON_POWER
 #   define MINESWP_TOGGLE_PRE BUTTON_PLAY
-#   define MINESWP_TOGGLE     (BUTTON_POWER | BUTTON_PREV)
-#   define MINESWP_TOGGLE2    (BUTTON_POWER | BUTTON_NEXT)
-#   define MINESWP_DISCOVER   (BUTTON_POWER | BUTTON_VOL_UP)
-#   define MINESWP_DISCOVER2  (BUTTON_POWER | BUTTON_VOL_DOWN)
-#   define MINESWP_INFO       (BUTTON_POWER | BUTTON_HOME)
+#   define MINESWP_TOGGLE     (BUTTON_PLAY | BUTTON_REL)
+#   define MINESWP_DISCOVER   (BUTTON_PLAY | BUTTON_REPEAT)
+#   define MINESWP_INFO       BUTTON_VOL_UP
 
 #else
 #error No keymap defined!