summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2013-09-26 13:22:45 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2013-09-26 13:22:45 +0200
commitf37f3393c997b775d177424d020bd5b16d43618a (patch)
tree57f81da81e610ddaa76b06d89ed17719a2328602 /uisimulator
parentddf56a102b053c29fa488bb9dbc99f863f610fdb (diff)
downloadrockbox-f37f3393c997b775d177424d020bd5b16d43618a.tar.gz
rockbox-f37f3393c997b775d177424d020bd5b16d43618a.tar.bz2
rockbox-f37f3393c997b775d177424d020bd5b16d43618a.zip
sonynwze370: fix simulator
Change-Id: I23cd8ce8549119868011e2a05341f3cb6335fad6
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/bitmaps/UI-sonynwze370.bmpbin0 -> 234078 bytes
-rw-r--r--uisimulator/buttonmap/SOURCES4
-rw-r--r--uisimulator/buttonmap/sony-nwz.c (renamed from uisimulator/buttonmap/sony-nwze360.c)17
3 files changed, 18 insertions, 3 deletions
diff --git a/uisimulator/bitmaps/UI-sonynwze370.bmp b/uisimulator/bitmaps/UI-sonynwze370.bmp
new file mode 100644
index 0000000000..067942b972
--- /dev/null
+++ b/uisimulator/bitmaps/UI-sonynwze370.bmp
Binary files differ
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index 3ed52f2c50..de9cf51467 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -74,8 +74,6 @@ creative-zenxfi2.c
#elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
sansa-connect.c
#elif CONFIG_KEYPAD == SONY_NWZ_PAD
-# ifdef SONY_NWZE360
-sony-nwze360.c
-# endif
+sony-nwz.c
#endif
#endif /* SIMULATOR */
diff --git a/uisimulator/buttonmap/sony-nwze360.c b/uisimulator/buttonmap/sony-nwz.c
index 1b84dc3ac2..a82b674a56 100644
--- a/uisimulator/buttonmap/sony-nwze360.c
+++ b/uisimulator/buttonmap/sony-nwz.c
@@ -51,12 +51,14 @@ int key_to_button(int keyboard_button)
case SDLK_DELETE:
new_btn = BUTTON_POWER;
break;
+#ifdef SONY_NWZE360
case SDLK_KP_PLUS:
new_btn = BUTTON_VOL_UP;
break;
case SDLK_KP_MINUS:
new_btn = BUTTON_VOL_DOWN;
break;
+#endif
case SDLK_KP1:
case SDLK_HOME:
case SDLK_BACKSPACE:
@@ -73,6 +75,7 @@ int key_to_button(int keyboard_button)
return new_btn;
}
+#if defined(SONY_NWZE360)
struct button_map bm[] = {
{ SDLK_LEFT, 100, 548, 30, "Left" },
{ SDLK_RIGHT, 240, 548, 30, "Right" },
@@ -85,4 +88,18 @@ struct button_map bm[] = {
{ SDLK_KP_PLUS, 339, 68, 30, "Volume +" },
{ 0, 0, 0, 0, "None" }
};
+#elif defined(SONY_NWZE370)
+struct button_map bm[] = {
+ { SDLK_LEFT, 56, 299, 20, "Left" },
+ { SDLK_RIGHT, 139, 299, 20, "Right" },
+ { SDLK_UP, 98, 256, 20, "Up" },
+ { SDLK_DOWN, 98, 340, 20, "Down" },
+ { SDLK_BACKSPACE, 44, 259, 35, "Back" },
+ { SDLK_DELETE, 152, 259, 35, "Power" },
+ { SDLK_RETURN, 98, 299, 40, "Play" },
+ { 0, 0, 0, 0, "None" }
+};
+#else
+#error please define button map
+#endif