2 files changed, 42 insertions, 0 deletions

diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index ba384b31b4..ee1117481b 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -802,6 +802,7 @@ void button_event(int key, bool pressed)
     case SDLK_KP_ENTER:
         new_btn = BUTTON_MENU;
         break;
+
 #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
     case SDLK_KP1:
         new_btn = BUTTON_BACK;
@@ -886,6 +887,34 @@ void button_event(int key, bool pressed)
         break;
     case SDLK_s:
         new_btn = BUTTON_VOL_UP;
+
+#elif CONFIG_KEYPAD == MEIZU_M6SL_PAD
+    case SDLK_KP1:
+        new_btn = BUTTON_PREV;
+        break;
+    case SDLK_KP3:
+        new_btn = BUTTON_NEXT;
+        break;
+    case SDLK_KP_ENTER:
+    case SDLK_RETURN:
+    case SDLK_a:
+        new_btn = BUTTON_PLAY;
+        break;
+    case SDLK_KP_PERIOD:
+    case SDLK_INSERT:
+        new_btn = BUTTON_MENU;
+        break;
+    case SDLK_KP8:
+    case SDLK_UP:
+        new_btn = BUTTON_UP;
+        break;
+    case SDLK_KP2:
+    case SDLK_DOWN:
+        new_btn = BUTTON_DOWN;
+        break;
+    case SDLK_KP5:
+    case SDLK_SPACE:
+        new_btn = BUTTON_SELECT;
         break;
 #else
 #error No keymap defined!
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index abd320ad18..dde505bf91 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -404,6 +404,19 @@
 #define UI_LCD_FGCOLOR              0, 0, 0 /* foreground color of LCD (no backlight) */
 #define UI_LCD_FGCOLORLIGHT         0, 0, 0 /* foreground color of LCD (backlight) */
 
+#elif defined(MEIZU_M6SL)
+#define UI_TITLE                    "Meizu M6"
+#define UI_WIDTH                    512 /* width of GUI window */
+#define UI_HEIGHT                   322 /* height of GUI window */
+#define UI_LCD_POSX                 39 /* x position of lcd */
+#define UI_LCD_POSY                 38 /* y position of lcd */
+#define UI_LCD_WIDTH                320
+#define UI_LCD_HEIGHT               240
+#define UI_LCD_BGCOLOR              32, 32, 32 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT         192, 192, 192 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_FGCOLOR              0, 0, 0 /* foreground color of LCD (no backlight) */
+#define UI_LCD_FGCOLORLIGHT         0, 0, 0 /* foreground color of LCD (backlight) */
+
 #endif
 extern SDL_Surface *gui_surface;
 extern bool background;  /* True if the background image is enabled */