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, 6 insertions, 15 deletions

diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index 77400dfff1..464af413f9 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -401,16 +401,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define SNAKE2_PLAYPAUSE    BUTTON_PLAY
 #define SNAKE2_PLAYPAUSE_TEXT    "PLAY"
 
-#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD)
-#define SNAKE2_LEFT         BUTTON_PREV
-#define SNAKE2_RIGHT        BUTTON_NEXT
-#define SNAKE2_UP           BUTTON_HOME
-#define SNAKE2_DOWN         BUTTON_OPTION
-#define SNAKE2_QUIT         BUTTON_POWER
-#define SNAKE2_PLAYPAUSE    BUTTON_PLAY
-#define SNAKE2_PLAYPAUSE_TEXT    "PLAY"
-
-#elif (CONFIG_KEYPAD == XDUOO_X20_PAD)
+#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD) || (CONFIG_KEYPAD == XDUOO_X20_PAD)
 #define SNAKE2_LEFT         BUTTON_PREV
 #define SNAKE2_RIGHT        BUTTON_NEXT
 #define SNAKE2_UP           BUTTON_HOME
@@ -428,7 +419,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define SNAKE2_PLAYPAUSE    BUTTON_PLAY
 #define SNAKE2_PLAYPAUSE_TEXT    "PLAY"
 
-#elif (CONFIG_KEYPAD == IHIFI_770_PAD)
+#elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD)
 #define SNAKE2_LEFT         BUTTON_HOME
 #define SNAKE2_RIGHT        BUTTON_VOL_DOWN
 #define SNAKE2_UP           BUTTON_PREV
@@ -437,9 +428,9 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define SNAKE2_PLAYPAUSE    BUTTON_PLAY
 #define SNAKE2_PLAYPAUSE_TEXT    "PLAY"
 
-#elif (CONFIG_KEYPAD == IHIFI_800_PAD)
-#define SNAKE2_LEFT         BUTTON_HOME
-#define SNAKE2_RIGHT        BUTTON_VOL_DOWN
+#elif (CONFIG_KEYPAD == EROSQ_PAD)
+#define SNAKE2_LEFT         BUTTON_SCROLL_BACK
+#define SNAKE2_RIGHT        BUTTON_SCROLL_FWD
 #define SNAKE2_UP           BUTTON_PREV
 #define SNAKE2_DOWN         BUTTON_NEXT
 #define SNAKE2_QUIT         BUTTON_POWER
@@ -451,7 +442,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #endif
 
 #ifdef HAVE_TOUCHSCREEN
-#ifndef SNAKE2_LEFT 
+#ifndef SNAKE2_LEFT
 #define SNAKE2_LEFT        BUTTON_MIDLEFT
 #endif
 #ifndef SNAKE2_RIGHT