diff options
-rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.c | 5 | ||||
-rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.h | 2 | ||||
-rw-r--r-- | utils/nwztools/database/models.txt | 1 | ||||
-rw-r--r-- | 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] = | |||
213 | { 0x23000004, "NW-ZX300A" }, | 213 | { 0x23000004, "NW-ZX300A" }, |
214 | { 0x23000006, "NW-ZX300" }, | 214 | { 0x23000006, "NW-ZX300" }, |
215 | { 0x24000004, "NW-A45" }, | 215 | { 0x24000004, "NW-A45" }, |
216 | { 0x24000005, "NW-A46" }, | ||
216 | { 0x24000006, "NW-A47" }, | 217 | { 0x24000006, "NW-A47" }, |
217 | }; | 218 | }; |
218 | 219 | ||
@@ -1350,7 +1351,7 @@ static unsigned long models_nw_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004, | |||
1350 | 1351 | ||
1351 | static unsigned long models_nw_a30[] = { 0x22000004, 0x22000005, 0x22000006 }; | 1352 | static unsigned long models_nw_a30[] = { 0x22000004, 0x22000005, 0x22000006 }; |
1352 | 1353 | ||
1353 | static unsigned long models_nw_a40[] = { 0x24000004, 0x24000006 }; | 1354 | static unsigned long models_nw_a40[] = { 0x24000004, 0x24000005, 0x24000006 }; |
1354 | 1355 | ||
1355 | static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, | 1356 | static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, |
1356 | 0x3020001, 0x3020002, 0x3020004 }; | 1357 | 0x3020001, 0x3020002, 0x3020004 }; |
@@ -1450,7 +1451,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | |||
1450 | { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee }, | 1451 | { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee }, |
1451 | { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, | 1452 | { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, |
1452 | { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 }, | 1453 | { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 }, |
1453 | { "nw-a40", "NW-A40 Series", 2, models_nw_a40, &nvp_index_139d65 }, | 1454 | { "nw-a40", "NW-A40 Series", 3, models_nw_a40, &nvp_index_139d65 }, |
1454 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, | 1455 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, |
1455 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 }, | 1456 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 }, |
1456 | { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 }, | 1457 | { "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 | |||
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 190 | 155 | #define NWZ_MODEL_COUNT 191 |
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 c0eca49da7..d618b3d83c 100644 --- a/utils/nwztools/database/models.txt +++ b/utils/nwztools/database/models.txt | |||
@@ -187,4 +187,5 @@ | |||
187 | 0x23000004,NW-ZX300A | 187 | 0x23000004,NW-ZX300A |
188 | 0x23000006,NW-ZX300 | 188 | 0x23000006,NW-ZX300 |
189 | 0x24000004,NW-A45 | 189 | 0x24000004,NW-A45 |
190 | 0x24000005,NW-A46 | ||
190 | 0x24000006,NW-A47 | 191 | 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 @@ | |||
1 | nwz-a10,NWZ-A10 Series,0x1a000001,0x1a000002,0x1a000004,0x1a000005,0x1a000006,0x1a010001,0x1a010002,0x1a010004,0x1a010005,0x1a010006 | 1 | nwz-a10,NWZ-A10 Series,0x1a000001,0x1a000002,0x1a000004,0x1a000005,0x1a000006,0x1a010001,0x1a010002,0x1a010004,0x1a010005,0x1a010006 |
2 | nw-a20,NW-A20 Series,0x1d000001,0x1d000002,0x1d000004,0x1d000005,0x1d000006,0x1d000007 | 2 | nw-a20,NW-A20 Series,0x1d000001,0x1d000002,0x1d000004,0x1d000005,0x1d000006,0x1d000007 |
3 | nw-a30,NW-A30 Series,0x22000004,0x22000005,0x22000006 | 3 | nw-a30,NW-A30 Series,0x22000004,0x22000005,0x22000006 |
4 | nw-a40,NW-A40 Series,0x24000004,0x24000006 | 4 | nw-a40,NW-A40 Series,0x24000004,0x24000005,0x24000006 |
5 | nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004 | 5 | nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004 |
6 | nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002 | 6 | nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002 |
7 | nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004 | 7 | nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004 |