summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/target/hosted/sonynwz/nwz-db.c5
-rw-r--r--firmware/target/hosted/sonynwz/nwz-db.h2
-rw-r--r--utils/nwztools/database/models.txt1
-rw-r--r--utils/nwztools/database/series.txt2
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 d8eda057be..8f511e14d1 100644
--- a/firmware/target/hosted/sonynwz/nwz-db.c
+++ b/firmware/target/hosted/sonynwz/nwz-db.c
@@ -212,6 +212,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] =
212 { 0x22000006, "NW-A37" }, 212 { 0x22000006, "NW-A37" },
213 { 0x23000004, "NW-ZX300A" }, 213 { 0x23000004, "NW-ZX300A" },
214 { 0x23000006, "NW-ZX300" }, 214 { 0x23000006, "NW-ZX300" },
215 { 0x24000004, "NW-A45" },
215 { 0x24000006, "NW-A47" }, 216 { 0x24000006, "NW-A47" },
216}; 217};
217 218
@@ -1349,7 +1350,7 @@ static unsigned long models_nw_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004,
1349 1350
1350static unsigned long models_nw_a30[] = { 0x22000004, 0x22000005, 0x22000006 }; 1351static unsigned long models_nw_a30[] = { 0x22000004, 0x22000005, 0x22000006 };
1351 1352
1352static unsigned long models_nw_a40[] = { 0x24000006 }; 1353static unsigned long models_nw_a40[] = { 0x24000004, 0x24000006 };
1353 1354
1354static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, 1355static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004,
1355 0x3020001, 0x3020002, 0x3020004 }; 1356 0x3020001, 0x3020002, 0x3020004 };
@@ -1449,7 +1450,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
1449 { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee }, 1450 { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee },
1450 { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, 1451 { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee },
1451 { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 }, 1452 { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 },
1452 { "nw-a40", "NW-A40 Series", 1, models_nw_a40, &nvp_index_139d65 }, 1453 { "nw-a40", "NW-A40 Series", 2, models_nw_a40, &nvp_index_139d65 },
1453 { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, 1454 { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 },
1454 { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 }, 1455 { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 },
1455 { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 }, 1456 { "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 2b59cb2d47..d9167c14db 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
152/* Invalid NVP index */ 152/* Invalid NVP index */
153#define NWZ_NVP_INVALID -1 /* Non-existent entry */ 153#define NWZ_NVP_INVALID -1 /* Non-existent entry */
154/* Number of models */ 154/* Number of models */
155#define NWZ_MODEL_COUNT 189 155#define NWZ_MODEL_COUNT 190
156/* Number of series */ 156/* Number of series */
157#define NWZ_SERIES_COUNT 38 157#define NWZ_SERIES_COUNT 38
158 158
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt
index 7576ae5569..c0eca49da7 100644
--- a/utils/nwztools/database/models.txt
+++ b/utils/nwztools/database/models.txt
@@ -186,4 +186,5 @@
1860x22000006,NW-A37 1860x22000006,NW-A37
1870x23000004,NW-ZX300A 1870x23000004,NW-ZX300A
1880x23000006,NW-ZX300 1880x23000006,NW-ZX300
1890x24000004,NW-A45
1890x24000006,NW-A47 1900x24000006,NW-A47
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index 0f51e5867f..420f03a78b 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -1,7 +1,7 @@
1nwz-a10,NWZ-A10 Series,0x1a000001,0x1a000002,0x1a000004,0x1a000005,0x1a000006,0x1a010001,0x1a010002,0x1a010004,0x1a010005,0x1a010006 1nwz-a10,NWZ-A10 Series,0x1a000001,0x1a000002,0x1a000004,0x1a000005,0x1a000006,0x1a010001,0x1a010002,0x1a010004,0x1a010005,0x1a010006
2nw-a20,NW-A20 Series,0x1d000001,0x1d000002,0x1d000004,0x1d000005,0x1d000006,0x1d000007 2nw-a20,NW-A20 Series,0x1d000001,0x1d000002,0x1d000004,0x1d000005,0x1d000006,0x1d000007
3nw-a30,NW-A30 Series,0x22000004,0x22000005,0x22000006 3nw-a30,NW-A30 Series,0x22000004,0x22000005,0x22000006
4nw-a40,NW-A40 Series,0x24000006 4nw-a40,NW-A40 Series,0x24000004,0x24000006
5nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004 5nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004
6nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002 6nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002
7nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004 7nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004