summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorMarcoen Hirschberg <marcoen@gmail.com>2008-03-27 11:53:51 +0000
committerMarcoen Hirschberg <marcoen@gmail.com>2008-03-27 11:53:51 +0000
commitb2ec13d8f1fc44e8e7076808b57b64365714a6f3 (patch)
tree8c8e716b0ae627a60fc8aebd9e64afd8d8d4e0e3 /uisimulator
parentf8690231bf82cf46b26efe68d4696d1cd18d1737 (diff)
downloadrockbox-b2ec13d8f1fc44e8e7076808b57b64365714a6f3.tar.gz
rockbox-b2ec13d8f1fc44e8e7076808b57b64365714a6f3.tar.bz2
rockbox-b2ec13d8f1fc44e8e7076808b57b64365714a6f3.zip
Revert "initial Meizu M6SL port"
This reverts commit b7bd17ce1715c3a8acbf74a63694c28b6075da5b. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16846 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/sdl/button.c31
-rw-r--r--uisimulator/sdl/uisdl.h13
2 files changed, 0 insertions, 44 deletions
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 78be6700ec..03f7dc1e96 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -772,37 +772,6 @@ void button_event(int key, bool pressed)
case SDLK_KP9:
new_btn = BUTTON_MENU;
break;
-
-#elif CONFIG_KEYPAD == MEIZU_M6SL_PAD
- case SDLK_KP4:
- case SDLK_LEFT:
- new_btn = BUTTON_LEFT;
- break;
- case SDLK_KP6:
- case SDLK_RIGHT:
- new_btn = BUTTON_RIGHT;
- 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_KP_ENTER:
- case SDLK_RETURN:
- case SDLK_a:
- new_btn = BUTTON_PLAY;
- break;
- case SDLK_KP5:
- case SDLK_SPACE:
- new_btn = BUTTON_SELECT;
- break;
- case SDLK_KP_PERIOD:
- case SDLK_INSERT:
- new_btn = BUTTON_MENU;
- break;
#else
#error No keymap defined!
#endif /* CONFIG_KEYPAD */
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index 890c6d0638..37989a682b 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -374,19 +374,6 @@
#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 */