From f37f3393c997b775d177424d020bd5b16d43618a Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Thu, 26 Sep 2013 13:22:45 +0200
Subject: [PATCH] sonynwze370: fix simulator

Change-Id: I23cd8ce8549119868011e2a05341f3cb6335fad6
---
 firmware/target/hosted/sdl/sim-ui-defines.h    |   7 +++++++
 uisimulator/bitmaps/UI-sonynwze370.bmp         | Bin 0 -> 234078 bytes
 uisimulator/buttonmap/SOURCES                  |   4 +---
 .../buttonmap/{sony-nwze360.c => sony-nwz.c}   |  17 +++++++++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 uisimulator/bitmaps/UI-sonynwze370.bmp
 rename uisimulator/buttonmap/{sony-nwze360.c => sony-nwz.c} (83%)

diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h
index 0b7e3fc82a..de250735e2 100644
--- a/firmware/target/hosted/sdl/sim-ui-defines.h
+++ b/firmware/target/hosted/sdl/sim-ui-defines.h
@@ -459,6 +459,13 @@
 #define UI_LCD_POSX                 50
 #define UI_LCD_POSY                 62
 
+#elif defined(SONY_NWZE370)
+#define UI_TITLE                    "Sony NWZ-E370"
+#define UI_WIDTH                    196 /* width of GUI window */
+#define UI_HEIGHT                   398 /* height of GUI window */
+#define UI_LCD_POSX                 34
+#define UI_LCD_POSY                 32
+
 #elif defined(APPLICATION)
 #define UI_TITLE                    "Rockbox"
 #define UI_LCD_POSX                 0
diff --git a/uisimulator/bitmaps/UI-sonynwze370.bmp b/uisimulator/bitmaps/UI-sonynwze370.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..067942b97295ee75e23ff2eadd6ee6236886f06d
GIT binary patch
literal 234078
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

literal 0
HcmV?d00001

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
similarity index 83%
rename from uisimulator/buttonmap/sony-nwze360.c
rename to 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