From 2ae792c2f58d03cfacdf52d179ea571eff795ce3 Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Tue, 24 Oct 2017 11:45:51 +0100
Subject: nwztools: add NW-ZX300A

Change-Id: I8b311ed6b48b92b9ecf4fb25c19119cfb2d5beb1
---
 firmware/target/hosted/sonynwz/nwz-db.c | 5 +++--
 firmware/target/hosted/sonynwz/nwz-db.h | 2 +-
 utils/nwztools/database/models.txt      | 1 +
 utils/nwztools/database/series.txt      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/firmware/target/hosted/sonynwz/nwz-db.c b/firmware/target/hosted/sonynwz/nwz-db.c
index 88872ffae7..d8eda057be 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.c
+++ b/firmware/target/hosted/sonynwz/nwz-db.c
@@ -210,6 +210,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] =
     { 0x22000004, "NW-A35" },
     { 0x22000005, "NW-A36" },
     { 0x22000006, "NW-A37" },
+    { 0x23000004, "NW-ZX300A" },
     { 0x23000006, "NW-ZX300" },
     { 0x24000006, "NW-A47" },
 };
@@ -1439,7 +1440,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[] = { 0x23000006 };
+static unsigned long models_nw_zx300[] = { 0x23000004, 0x23000006 };
 
 static unsigned long models_nwz_noname[] = { 0x5010002, 0x5010004, 0x5010005 };
 
@@ -1481,6 +1482,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", 1, models_nw_zx300, &nvp_index_139d65 },
+    { "nw-zx300", "NW-ZX300 Series", 2, 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 f2efb88847..2b59cb2d47 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.h
+++ b/firmware/target/hosted/sonynwz/nwz-db.h
@@ -152,7 +152,7 @@ enum nwz_nvp_node_t
 /* Invalid NVP index */
 #define NWZ_NVP_INVALID     -1 /* Non-existent entry */
 /* Number of models */
-#define NWZ_MODEL_COUNT     188
+#define NWZ_MODEL_COUNT     189
 /* Number of series */
 #define NWZ_SERIES_COUNT    38
 
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt
index c7329e8b59..7576ae5569 100644
--- a/utils/nwztools/database/models.txt
+++ b/utils/nwztools/database/models.txt
@@ -184,5 +184,6 @@
 0x22000004,NW-A35
 0x22000005,NW-A36
 0x22000006,NW-A37
+0x23000004,NW-ZX300A
 0x23000006,NW-ZX300
 0x24000006,NW-A47
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index 2431a56ab1..0f51e5867f 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -34,5 +34,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,0x23000006
+nw-zx300,NW-ZX300 Series,0x23000004,0x23000006
 nwz-noname,NONAME,0x5010002,0x5010004,0x5010005
-- 
cgit v1.2.3