From ddf56a102b053c29fa488bb9dbc99f863f610fdb Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Wed, 25 Sep 2013 18:22:26 +0200
Subject: [PATCH] sonynwze360: fix simulator

Change-Id: Ib63d5aceeafb1078013599616cb6dcec3a2b8598
---
 firmware/target/hosted/sdl/sim-ui-defines.h |   7 ++
 uisimulator/bitmaps/UI-sonynwze360.bmp      | Bin 0 -> 687534 bytes
 uisimulator/buttonmap/SOURCES               |   4 +
 uisimulator/buttonmap/sony-nwze360.c        |  88 ++++++++++++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 uisimulator/bitmaps/UI-sonynwze360.bmp
 create mode 100644 uisimulator/buttonmap/sony-nwze360.c

diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h
index edcc695ab2..0b7e3fc82a 100644
--- a/firmware/target/hosted/sdl/sim-ui-defines.h
+++ b/firmware/target/hosted/sdl/sim-ui-defines.h
@@ -452,6 +452,13 @@
 #define UI_LCD_POSX                 42
 #define UI_LCD_POSY                 42
 
+#elif defined(SONY_NWZE360)
+#define UI_TITLE                    "Sony NWZ-E360"
+#define UI_WIDTH                    340 /* width of GUI window */
+#define UI_HEIGHT                   674 /* height of GUI window */
+#define UI_LCD_POSX                 50
+#define UI_LCD_POSY                 62
+
 #elif defined(APPLICATION)
 #define UI_TITLE                    "Rockbox"
 #define UI_LCD_POSX                 0
diff --git a/uisimulator/bitmaps/UI-sonynwze360.bmp b/uisimulator/bitmaps/UI-sonynwze360.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..3ce93b4029e2996914c9dff0269d576183e60f2e
GIT binary patch
literal 687534
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
Tz8!kh3Qz>5NML-0#uok`&HF>*

literal 0
HcmV?d00001

diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index 57f0e643f4..3ed52f2c50 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -73,5 +73,9 @@ creative-zenxfi3.c
 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
 #endif
 #endif /* SIMULATOR */
diff --git a/uisimulator/buttonmap/sony-nwze360.c b/uisimulator/buttonmap/sony-nwze360.c
new file mode 100644
index 0000000000..1b84dc3ac2
--- /dev/null
+++ b/uisimulator/buttonmap/sony-nwze360.c
@@ -0,0 +1,88 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2013 by Amaury Pouly
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+
+#include <SDL.h>
+#include "button.h"
+#include "buttonmap.h"
+
+int key_to_button(int keyboard_button)
+{
+    int new_btn = BUTTON_NONE;
+    switch (keyboard_button)
+    {
+        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_END:
+        case SDLK_KP3:
+        case SDLK_ESCAPE:
+        case SDLK_DELETE:
+            new_btn = BUTTON_POWER;
+            break;
+        case SDLK_KP_PLUS:
+            new_btn = BUTTON_VOL_UP;
+            break;
+        case SDLK_KP_MINUS:
+            new_btn = BUTTON_VOL_DOWN;
+            break;
+        case SDLK_KP1:
+        case SDLK_HOME:
+        case SDLK_BACKSPACE:
+            new_btn = BUTTON_BACK;
+            break;
+        case SDLK_KP_ENTER:
+        case SDLK_RETURN:
+        case SDLK_SPACE:
+        case SDLK_INSERT:
+        case SDLK_KP5:
+            new_btn = BUTTON_PLAY;
+            break;
+    }
+    return new_btn;
+}
+
+struct button_map bm[] = {
+    { SDLK_LEFT,        100, 548, 30, "Left" },
+    { SDLK_RIGHT,       240, 548, 30, "Right" },
+    { SDLK_UP,          170, 478, 30, "Up" },
+    { SDLK_DOWN,        170, 619, 30, "Down" },
+    { SDLK_BACKSPACE,    81, 484, 35, "Back" },
+    { SDLK_DELETE,      256, 484, 35, "Power" },
+    { SDLK_RETURN,      170, 548, 40, "Play" },
+    { SDLK_KP_MINUS,    339, 128, 30, "Volume -" },
+    { SDLK_KP_PLUS,     339,  68, 30, "Volume +" },
+    { 0, 0, 0, 0, "None" }
+};
+