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, 11 insertions, 19 deletions

diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index c96946cf7d..75de5230f2 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -425,17 +425,7 @@ static void setoptions (void)
         options.SELECT  = BUTTON_VOL_UP;
         options.MENU    = BUTTON_POWER;
 
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-        options.UP      = BUTTON_PREV;
-        options.DOWN    = BUTTON_NEXT;
-
-        options.A       = BUTTON_HOME;
-        options.B       = BUTTON_OPTION;
-        options.START   = BUTTON_VOL_DOWN;
-        options.SELECT  = BUTTON_VOL_UP;
-        options.MENU    = BUTTON_POWER;
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
         options.UP      = BUTTON_PREV;
         options.DOWN    = BUTTON_NEXT;
 
@@ -455,7 +445,7 @@ static void setoptions (void)
         options.SELECT  = BUTTON_VOL_UP;
         options.MENU    = BUTTON_POWER;
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
         options.UP      = BUTTON_PREV;
         options.DOWN    = BUTTON_NEXT;
 
@@ -465,14 +455,16 @@ static void setoptions (void)
         options.SELECT  = BUTTON_HOME;
         options.MENU    = BUTTON_POWER;
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
-        options.UP      = BUTTON_PREV;
-        options.DOWN    = BUTTON_NEXT;
+#elif CONFIG_KEYPAD == EROSQ_PAD
+        options.UP     = BUTTON_PREV;
+        options.DOWN   = BUTTON_NEXT;
+        options.LEFT   = BUTTON_SCROLL_BACK;
+        options.RIGHT  = BUTTON_SCROLL_FWD;
 
-        options.A       = BUTTON_VOL_UP;
-        options.B       = BUTTON_VOL_DOWN;
-        options.START   = BUTTON_PLAY;
-        options.SELECT  = BUTTON_HOME;
+        options.A       = BUTTON_MENU;
+        options.B       = BUTTON_BACK;
+        options.START   = BUTTON_VOL_DOWN;
+        options.SELECT  = BUTTON_VOL_UP;
         options.MENU    = BUTTON_POWER;
 
 #else