From 62f0ba1c302a6e25e8ba55c0ba4eab2469357bbd Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Wed, 1 Nov 2017 12:42:55 +0100
Subject: nwztools: add NW-A46 to the database

Change-Id: I85dc2080e0be07ff689384c0445f4f1595baf4ac
---
 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 8f511e14d1..550f6f9d30 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.c
+++ b/firmware/target/hosted/sonynwz/nwz-db.c
@@ -213,6 +213,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] =
     { 0x23000004, "NW-ZX300A" },
     { 0x23000006, "NW-ZX300" },
     { 0x24000004, "NW-A45" },
+    { 0x24000005, "NW-A46" },
     { 0x24000006, "NW-A47" },
 };
 
@@ -1350,7 +1351,7 @@ static unsigned long models_nw_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004,
 
 static unsigned long models_nw_a30[] = { 0x22000004, 0x22000005, 0x22000006 };
 
-static unsigned long models_nw_a40[] = { 0x24000004, 0x24000006 };
+static unsigned long models_nw_a40[] = { 0x24000004, 0x24000005, 0x24000006 };
 
 static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004,
     0x3020001, 0x3020002, 0x3020004 };
@@ -1450,7 +1451,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
     { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee },
     { "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", 2, models_nw_a40, &nvp_index_139d65 },
+    { "nw-a40", "NW-A40 Series", 3, models_nw_a40, &nvp_index_139d65 },
     { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 },
     { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 },
     { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 },
diff --git a/firmware/target/hosted/sonynwz/nwz-db.h b/firmware/target/hosted/sonynwz/nwz-db.h
index d9167c14db..8d42c54194 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     190
+#define NWZ_MODEL_COUNT     191
 /* Number of series */
 #define NWZ_SERIES_COUNT    38
 
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt
index c0eca49da7..d618b3d83c 100644
--- a/utils/nwztools/database/models.txt
+++ b/utils/nwztools/database/models.txt
@@ -187,4 +187,5 @@
 0x23000004,NW-ZX300A
 0x23000006,NW-ZX300
 0x24000004,NW-A45
+0x24000005,NW-A46
 0x24000006,NW-A47
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index 420f03a78b..25c2f50a3a 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -1,7 +1,7 @@
 nwz-a10,NWZ-A10 Series,0x1a000001,0x1a000002,0x1a000004,0x1a000005,0x1a000006,0x1a010001,0x1a010002,0x1a010004,0x1a010005,0x1a010006
 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,0x24000006
+nw-a40,NW-A40 Series,0x24000004,0x24000005,0x24000006
 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
-- 
cgit v1.2.3