1 files changed, 10 insertions, 19 deletions

diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index c16c3cd20a..f77ce538d1 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -36,7 +36,7 @@
 
 /* TODO: Check keyboard mappings */
 
-#define KBD_SELECT BUTTON_SELECT 
+#define KBD_SELECT BUTTON_SELECT
 #define KBD_ABORT BUTTON_PLAY
 #define KBD_LEFT BUTTON_LEFT
 #define KBD_RIGHT BUTTON_RIGHT
@@ -257,16 +257,7 @@
 #define KBD_UP     BUTTON_HOME
 #define KBD_DOWN   BUTTON_OPTION
 
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-
-#define KBD_SELECT BUTTON_PLAY
-#define KBD_ABORT  BUTTON_POWER
-#define KBD_LEFT   BUTTON_PREV
-#define KBD_RIGHT  BUTTON_NEXT
-#define KBD_UP     BUTTON_HOME
-#define KBD_DOWN   BUTTON_OPTION
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 
 #define KBD_SELECT BUTTON_PLAY
 #define KBD_ABORT  BUTTON_POWER
@@ -284,7 +275,7 @@
 #define KBD_UP     BUTTON_HOME
 #define KBD_DOWN   BUTTON_OPTION
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 
 #define KBD_SELECT BUTTON_PLAY
 #define KBD_ABORT  BUTTON_POWER
@@ -293,12 +284,12 @@
 #define KBD_UP     BUTTON_PREV
 #define KBD_DOWN   BUTTON_NEXT
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
 
 #define KBD_SELECT BUTTON_PLAY
-#define KBD_ABORT  BUTTON_POWER
-#define KBD_LEFT   BUTTON_HOME
-#define KBD_RIGHT  BUTTON_VOL_DOWN
+#define KBD_ABORT  BUTTON_BACK
+#define KBD_LEFT   BUTTON_SCROLL_BACK
+#define KBD_RIGHT  BUTTON_SCROLL_FWD
 #define KBD_UP     BUTTON_PREV
 #define KBD_DOWN   BUTTON_NEXT
 
@@ -581,7 +572,7 @@ int zx_kbd_input(char* text/*, int buflen*/)
         }
         cur_blink = !cur_blink;
 
-        
+
             /* highlight the key that has focus */
             FOR_NB_SCREENS(l)
             {
@@ -591,7 +582,7 @@ int zx_kbd_input(char* text/*, int buflen*/)
                                         param[l].font_w, param[l].font_h);
                 rb->screens[l]->set_drawmode(DRMODE_SOLID);
             }
-        
+
         FOR_NB_SCREENS(l)
         rb->screens[l]->update();
 
@@ -687,7 +678,7 @@ int zx_kbd_input(char* text/*, int buflen*/)
                     char_screen = 0;
 
                 /* inserts the selected char */
-                
+
                     /* find input char */
                         k = (param[char_screen].page*param[char_screen].lines +
                             param[char_screen].y)*param[char_screen].max_chars +