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, 5 insertions, 30 deletions

diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 4452f23357..4f4ffc8df6 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -41,9 +41,6 @@
 #include "pluginbitmaps/brickmania_break.h"
 #endif
 
-
-
-
 /*
  *
  * Keymaps
@@ -307,27 +304,7 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define UP        BUTTON_UP
 #define DOWN      BUTTON_DOWN
 
-#elif CONFIG_KEYPAD == XDUOO_X3_PAD
-#define QUIT      BUTTON_POWER
-#define LEFT      BUTTON_PREV
-#define RIGHT     BUTTON_NEXT
-#define ALTLEFT   BUTTON_VOL_DOWN
-#define ALTRIGHT  BUTTON_VOL_UP
-#define SELECT    BUTTON_PLAY
-#define UP        BUTTON_HOME
-#define DOWN      BUTTON_OPTION
-
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define QUIT      BUTTON_POWER
-#define LEFT      BUTTON_PREV
-#define RIGHT     BUTTON_NEXT
-#define ALTLEFT   BUTTON_VOL_DOWN
-#define ALTRIGHT  BUTTON_VOL_UP
-#define SELECT    BUTTON_PLAY
-#define UP        BUTTON_HOME
-#define DOWN      BUTTON_OPTION
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3_PAD || CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 #define QUIT      BUTTON_POWER
 #define LEFT      BUTTON_PREV
 #define RIGHT     BUTTON_NEXT
@@ -347,7 +324,7 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define UP        BUTTON_HOME
 #define DOWN      BUTTON_OPTION
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD ||  CONFIG_KEYPAD == IHIFI_800_PAD
 #define QUIT      BUTTON_POWER
 #define LEFT      BUTTON_HOME
 #define RIGHT     BUTTON_VOL_DOWN
@@ -357,12 +334,10 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define UP        BUTTON_PREV
 #define DOWN      BUTTON_NEXT
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
 #define QUIT      BUTTON_POWER
-#define LEFT      BUTTON_HOME
-#define RIGHT     BUTTON_VOL_DOWN
-#define ALTLEFT   (BUTTON_POWER | BUTTON_HOME)
-#define ALTRIGHT  (BUTTON_POWER | BUTTON_VOL_UP)
+#define LEFT      BUTTON_SCROLL_BACK
+#define RIGHT     BUTTON_SCROLL_FWD
 #define SELECT    BUTTON_PLAY
 #define UP        BUTTON_PREV
 #define DOWN      BUTTON_NEXT