From 110e3b43a07ad40ad521e0d1afb44fc4f52f6353 Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Fri, 30 Nov 2018 15:31:55 +0100
Subject: [PATCH] sonynwz: add NW-A57 and NW-ZX300G to the database

Change-Id: I9bbfa56c5b2d79568de5443f1098d724c4beda6a
---
 firmware/target/hosted/sonynwz/nwz-db.c | 10 ++++++----
 firmware/target/hosted/sonynwz/nwz-db.h |  2 +-
 utils/nwztools/database/models.txt      |  2 ++
 utils/nwztools/database/series.txt      |  4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/firmware/target/hosted/sonynwz/nwz-db.c b/firmware/target/hosted/sonynwz/nwz-db.c
index 811aa7122d..a8ba2a7b85 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.c
+++ b/firmware/target/hosted/sonynwz/nwz-db.c
@@ -213,10 +213,12 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] =
     { 0x22000006, "NW-A37" },
     { 0x23000004, "NW-ZX300A" },
     { 0x23000006, "NW-ZX300" },
+    { 0x23000007, "NW-ZX300" },
     { 0x24000004, "NW-A45" },
     { 0x24000005, "NW-A46" },
     { 0x24000006, "NW-A47" },
     { 0x25000004, "NW-A55" },
+    { 0x25000006, "NW-A57" },
 };
 
 static int nvp_index_06a782[NWZ_NVP_COUNT] =
@@ -1790,7 +1792,7 @@ static unsigned long models_nw_a30[] = { 0x22000004, 0x22000005, 0x22000006 };
 
 static unsigned long models_nw_a40[] = { 0x24000004, 0x24000005, 0x24000006 };
 
-static unsigned long models_nw_a50[] = { 0x25000004 };
+static unsigned long models_nw_a50[] = { 0x25000004, 0x25000006 };
 
 static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004,
     0x3020001, 0x3020002, 0x3020004 };
@@ -1881,7 +1883,7 @@ static unsigned long models_nwz_x1000[] = { 0x5000002, 0x5000004, 0x5000005,
 static unsigned long models_nw_zx100[] = { 0x1c000007, 0x1c000001, 0x1c000002,
     0x1c000004, 0x1c000005, 0x1c000006 };
 
-static unsigned long models_nw_zx300[] = { 0x23000004, 0x23000006 };
+static unsigned long models_nw_zx300[] = { 0x23000004, 0x23000006, 0x23000007 };
 
 static unsigned long models_nwz_noname[] = { 0x5010002, 0x5010004, 0x5010005 };
 
@@ -1891,7 +1893,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
     { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee },
     { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 },
     { "nw-a40", "NW-A40 Series", 3, models_nw_a40, &nvp_index_139d65 },
-    { "nw-a50", "NW-A50 Series", 1, models_nw_a50, &nvp_index_94b5fc },
+    { "nw-a50", "NW-A50 Series", 2, models_nw_a50, &nvp_index_94b5fc },
     { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 },
     { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, &nvp_index_342a18 },
     { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 },
@@ -1924,6 +1926,6 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
     { "nw-wm1", "NW-WM1 Series", 2, models_nw_wm1, &nvp_index_398250 },
     { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, &nvp_index_4edba7 },
     { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, &nvp_index_92faee },
-    { "nw-zx300", "NW-ZX300 Series", 2, models_nw_zx300, &nvp_index_139d65 },
+    { "nw-zx300", "NW-ZX300 Series", 3, models_nw_zx300, &nvp_index_139d65 },
     { "nwz-noname", "NONAME", 3, models_nwz_noname, 0 },
 };
diff --git a/firmware/target/hosted/sonynwz/nwz-db.h b/firmware/target/hosted/sonynwz/nwz-db.h
index fa76cd81b4..152a111644 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.h
+++ b/firmware/target/hosted/sonynwz/nwz-db.h
@@ -157,7 +157,7 @@ enum nwz_nvp_node_t
 /* Invalid NVP index */
 #define NWZ_NVP_INVALID     -1 /* Non-existent entry */
 /* Number of models */
-#define NWZ_MODEL_COUNT     193
+#define NWZ_MODEL_COUNT     195
 /* Number of series */
 #define NWZ_SERIES_COUNT    39
 
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt
index bc83d88825..d89f0aa015 100644
--- a/utils/nwztools/database/models.txt
+++ b/utils/nwztools/database/models.txt
@@ -191,3 +191,5 @@
 0x24000005,NW-A46
 0x24000006,NW-A47
 0x25000004,NW-A55
+0x25000006,NW-A57
+0x23000007,NW-ZX300
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index 33db68d880..14d267fbfe 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -2,7 +2,7 @@ nwz-a10,NWZ-A10 Series,0x1a000001,0x1a000002,0x1a000004,0x1a000005,0x1a000006,0x
 nw-a20,NW-A20 Series,0x1d000001,0x1d000002,0x1d000004,0x1d000005,0x1d000006,0x1d000007
 nw-a30,NW-A30 Series,0x22000004,0x22000005,0x22000006
 nw-a40,NW-A40 Series,0x24000004,0x24000005,0x24000006
-nw-a50,NW-A50 Series,0x25000004
+nw-a50,NW-A50 Series,0x25000004,0x25000006
 nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004
 nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002
 nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004
@@ -35,5 +35,5 @@ nw-s780,NW-S780 Series,0x19000001,0x19000002,0x19000004,0x19000005
 nw-wm1,NW-WM1 Series,0x20000007,0x21000008
 nwz-x1000,NWZ-X1000 Series,0x5000002,0x5000004,0x5000005,0x5020002,0x5040002,0x5020004,0x5040004,0x5020005,0x5040005
 nw-zx100,NW-ZX100 Series,0x1c000007,0x1c000001,0x1c000002,0x1c000004,0x1c000005,0x1c000006
-nw-zx300,NW-ZX300 Series,0x23000004,0x23000006
+nw-zx300,NW-ZX300 Series,0x23000004,0x23000006,0x23000007
 nwz-noname,NONAME,0x5010002,0x5010004,0x5010005