From 127e6bbfddab60039085d4ad74a8baae18372717 Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Sun, 17 Sep 2017 22:32:13 +0200
Subject: [PATCH] Add support for the NWZ-E350

Strangely it has the SAME encryption key as the E450. Either they didn't bother
changing it or more likely they have exactly the same internals and a slightly
different case.

Change-Id: I39ab88845b3e40db34160c2e61dde421f391df44
---
 firmware/export/config.h             |  2 ++
 firmware/export/config/sonynwze350.h | 16 ++++++++++
 rbutil/mknwzboot/mknwzboot.c         |  1 +
 tools/configure                      | 45 +++++++++++++++++++++-------
 tools/scramble.c                     |  4 ++-
 utils/nwztools/upgtools/upg.c        |  1 +
 6 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 firmware/export/config/sonynwze350.h

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 0a10b59f52..51e0f7a17b 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -599,6 +599,8 @@ Lyre prototype 1 */
 #include "config/sonynwza860.h"
 #elif defined(SONY_NWZS750)
 #include "config/sonynwzs750.h"
+#elif defined(SONY_NWZE350)
+#include "config/sonynwze350.h"
 #else
 /* no known platform */
 #endif
diff --git a/firmware/export/config/sonynwze350.h b/firmware/export/config/sonynwze350.h
new file mode 100644
index 0000000000..d779052f6d
--- /dev/null
+++ b/firmware/export/config/sonynwze350.h
@@ -0,0 +1,16 @@
+/*
+ * This config file is for the Sony NWZ-E350 series
+ */
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 109
+
+#define MODEL_NAME   "Sony NWZ-E350 Series"
+
+/* LCD dimensions */
+#define LCD_WIDTH  240
+#define LCD_HEIGHT 320
+/* sqrt(240^2 + 320^2) / 2 = 200 */
+#define LCD_DPI 200
+
+#include "sonynwzlinux.h"
diff --git a/rbutil/mknwzboot/mknwzboot.c b/rbutil/mknwzboot/mknwzboot.c
index 2e574a94d7..22885674d8 100644
--- a/rbutil/mknwzboot/mknwzboot.c
+++ b/rbutil/mknwzboot/mknwzboot.c
@@ -45,6 +45,7 @@ struct nwz_model_desc_t
 
 static const struct nwz_model_desc_t nwz_models[] =
 {
+    { "Sony NWZ-E350 Series", "e350", 109, "nwz-e350" },
     { "Sony NWZ-E450 Series", "e450", 100, "nwz-e450" },
     { "Sony NWZ-E460 Series", "e460", 101, "nwz-e460" },
     { "Sony NWZ-E470 Series", "e470", 103, "nwz-e470" },
diff --git a/tools/configure b/tools/configure
index 6e44adef16..bd5fba6607 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1504,17 +1504,17 @@ cat <<EOF
  200) SDL                 ==HiFi E.T.==          191) HM-801
  201) Android             210) MA9
  202) Nokia N8xx          211) MA9C              ==Sony==
- 203) Nokia N900          212) MA8               220) NWZ-E370/E380 series
- 204) Pandora             213) MA8C              221) NWZ-E360 series
- 205) Samsung YP-R0                              222) NWZ-E450 series
- 206) Android MIPS        ==IHIFI==              223) NWZ-E460 series
- 207) Android x86         230) 760               224) NWZ-E470 series
- 208) Samsung YP-R1       231) 960               225) NWZ-E580 series
-                                                 226) NWZ-A10 series
- ==iBasso==                                      227) NW-A20 series
- 232) DX50                                       228) NWZ-A860 series
- 233) DX90                                       229) NWZ-S750 series
-
+ 203) Nokia N900          212) MA8               219) NWZ-E350 series
+ 204) Pandora             213) MA8C              220) NWZ-E370/E380 series
+ 205) Samsung YP-R0                              221) NWZ-E360 series
+ 206) Android MIPS        ==IHIFI==              222) NWZ-E450 series
+ 207) Android x86         230) 760               223) NWZ-E460 series
+ 208) Samsung YP-R1       231) 960               224) NWZ-E470 series
+                                                 225) NWZ-E580 series
+ ==iBasso==                                      226) NWZ-A10 series
+ 232) DX50                                       227) NW-A20 series
+ 233) DX90                                       228) NWZ-A860 series
+                                                 229) NWZ-S750 series
 EOF
 
   buildfor=`input`;
@@ -3829,6 +3829,29 @@ fi
     t_model="ma"
     ;;
 
+   219|sonynwze350)
+    application="yes"
+    target_id=105
+    modelname="sonynwze350"
+    target="SONY_NWZE350"
+    memory=16
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    tool="cp"
+    output="rockbox.sony"
+    boottool="$rootdir/tools/scramble -add=e350"
+    bootoutput="bootloader-nwze350.sony"
+    appextra="gui:recorder"
+    plugins=""
+    swcodec="yes"
+    toolset=$genericbitmaptools
+    t_cpu="hosted"
+    t_manufacturer="sonynwz"
+    t_model="nwze350"
+    uname=`uname`
+    sonynwzcc
+    ;;
+
    220|sonynwze370)
     target_id=88
     modelname="sonynwze370"
diff --git a/tools/scramble.c b/tools/scramble.c
index 81a796479b..14be30de69 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -130,7 +130,7 @@ void usage(void)
            "\t                   747p, x777, nn2g, m244, cli+, fuz2, hd20, hd30,\n"
            "\t                   ip6g, rk27, clzp, zxf2, zxf3, fuz+, e370, e360,\n"
            "\t                   zxfi, zmoz, zen, zenv, ypz5, zxfs, e450, e460,\n"
-           "\t                   e470,e580,a10,a20,a860,s750)\n");
+           "\t                   e470,e580,a10,a20,a860,s750,e350)\n");
     printf("\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -399,6 +399,8 @@ int main (int argc, char** argv)
             modelnum = 107;
         else if (!strcmp(&argv[1][5], "s750")) /* Sony NWZ-S750 series */
             modelnum = 108;
+        else if (!strcmp(&argv[1][5], "e350")) /* Sony NWZ-E350 series */
+            modelnum = 109;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;
diff --git a/utils/nwztools/upgtools/upg.c b/utils/nwztools/upgtools/upg.c
index 80d88ee3d2..64c02c0db1 100644
--- a/utils/nwztools/upgtools/upg.c
+++ b/utils/nwztools/upgtools/upg.c
@@ -28,6 +28,7 @@ struct nwz_model_t g_model_list[] =
 {
     { "nwz-a10", true, "2572f4a7b8c1a08aeb5142ce9cb834d6" },
     { "nw-a20", true, "d91a61c7263bafc626e9a5b66f983c0b" },
+    { "nwz-e350", true, "8a01b624bfbfde4a1662a1772220e3c5" },
     { "nwz-e450", true, "8a01b624bfbfde4a1662a1772220e3c5" },
     { "nwz-e460", true, "89d813f8f966efdebd9c9e0ea98156d2" },
     { "nwz-a860", true, "a7c4af6c28b8900a783f307c1ba538c5" },