From 110fd2cae6c0430c2033f01fb3c1ace11a32f327 Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Fri, 1 Jun 2018 12:43:05 +0200
Subject: [PATCH] Add the NWZ-A844 to the database

For some reason even Sony didn't have it in its list...

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

diff --git a/firmware/target/hosted/sonynwz/nwz-db.c b/firmware/target/hosted/sonynwz/nwz-db.c
index dc4c23ca07..811aa7122d 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.c
+++ b/firmware/target/hosted/sonynwz/nwz-db.c
@@ -88,6 +88,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] =
     { 0x6030002, "NW-S744" },
     { 0x6030004, "NW-S745" },
     { 0x6030005, "NW-S746" },
+    { 0x7000002, "NWZ-A844" },
     { 0x7000004, "NWZ-A845" },
     { 0x7000005, "NWZ-A846" },
     { 0x7000006, "NWZ-A847" },
@@ -1799,8 +1800,8 @@ static unsigned long models_nwz_a810[] = { 0x10000, 0x10001, 0x10002 };
 static unsigned long models_nwz_a820[] = { 0x3010001, 0x3010002, 0x3010004,
     0x3000001, 0x3000002, 0x3000004 };
 
-static unsigned long models_nwz_a840[] = { 0x7010004, 0x7010005, 0x7010006,
-    0x7000004, 0x7000005, 0x7000006 };
+static unsigned long models_nwz_a840[] = { 0x7000002, 0x7010004, 0x7010005,
+    0x7010006, 0x7000004, 0x7000005, 0x7000006 };
 
 static unsigned long models_nwz_a850[] = { 0xe000004, 0xe000005, 0xe000006 };
 
@@ -1894,7 +1895,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
     { "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 },
-    { "nwz-a840", "NWZ-A840 Series", 6, models_nwz_a840, &nvp_index_0ac81d },
+    { "nwz-a840", "NWZ-A840 Series", 7, models_nwz_a840, &nvp_index_0ac81d },
     { "nwz-a850", "NWZ-A850 Series", 3, models_nwz_a850, &nvp_index_0ac81d },
     { "nwz-a860", "NWZ-A860 Series", 15, models_nwz_a860, &nvp_index_f505c8 },
     { "nw-a910", "NW-A910 Series", 3, models_nw_a910, 0 },
diff --git a/firmware/target/hosted/sonynwz/nwz-db.h b/firmware/target/hosted/sonynwz/nwz-db.h
index 1fe383b715..fa76cd81b4 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     192
+#define NWZ_MODEL_COUNT     193
 /* Number of series */
 #define NWZ_SERIES_COUNT    39
 
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt
index f691a6df4d..bc83d88825 100644
--- a/utils/nwztools/database/models.txt
+++ b/utils/nwztools/database/models.txt
@@ -62,6 +62,7 @@
 0x6030002,NW-S744
 0x6030004,NW-S745
 0x6030005,NW-S746
+0x7000002,NWZ-A844
 0x7000004,NWZ-A845
 0x7000005,NWZ-A846
 0x7000006,NWZ-A847
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index d914588ef3..33db68d880 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -6,7 +6,7 @@ nw-a50,NW-A50 Series,0x25000004
 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
-nwz-a840,NWZ-A840 Series,0x7010004,0x7010005,0x7010006,0x7000004,0x7000005,0x7000006
+nwz-a840,NWZ-A840 Series,0x7000002,0x7010004,0x7010005,0x7010006,0x7000004,0x7000005,0x7000006
 nwz-a850,NWZ-A850 Series,0xe000004,0xe000005,0xe000006
 nwz-a860,NWZ-A860 Series,0x11000001,0x11000002,0x11000004,0x11000005,0x11000006,0x11010001,0x11010002,0x11010004,0x11010005,0x11010006,0x11020001,0x11020002,0x11020004,0x11020005,0x11020006
 nw-a910,NW-A910 Series,0x2000001,0x2000002,0x2000004