From 69223234666afdf739483b64a41e3419f5a00f69 Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Tue, 17 Oct 2017 13:05:11 +0200
Subject: sonynwz: add NW-A47 to the database and regenerate nwz_db.{c,h}

Change-Id: I6331a48a4d336348e90a32cf151427b29eeedb2b
---
 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 8414de1fa7..88872ffae7 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.c
+++ b/firmware/target/hosted/sonynwz/nwz-db.c
@@ -211,6 +211,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] =
     { 0x22000005, "NW-A36" },
     { 0x22000006, "NW-A37" },
     { 0x23000006, "NW-ZX300" },
+    { 0x24000006, "NW-A47" },
 };
 
 static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
@@ -1347,7 +1348,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[] = {  };
+static unsigned long models_nw_a40[] = { 0x24000006 };
 
 static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004,
     0x3020001, 0x3020002, 0x3020004 };
@@ -1447,7 +1448,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", 0, models_nw_a40, &nvp_index_139d65 },
+    { "nw-a40", "NW-A40 Series", 1, 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 35642f18c4..f2efb88847 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     187
+#define NWZ_MODEL_COUNT     188
 /* Number of series */
 #define NWZ_SERIES_COUNT    38
 
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt
index 94c3e5bf88..c7329e8b59 100644
--- a/utils/nwztools/database/models.txt
+++ b/utils/nwztools/database/models.txt
@@ -185,3 +185,4 @@
 0x22000005,NW-A36
 0x22000006,NW-A37
 0x23000006,NW-ZX300
+0x24000006,NW-A47
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index 9b861c0620..2431a56ab1 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,
+nw-a40,NW-A40 Series,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