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 ca60bdf795..62722f4429 100644 --- a/firmware/target/hosted/sonynwz/nwz-db.c +++ b/firmware/target/hosted/sonynwz/nwz-db.c | |||
@@ -218,6 +218,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] = | |||
218 | { 0x24000005, "NW-A46" }, | 218 | { 0x24000005, "NW-A46" }, |
219 | { 0x24000006, "NW-A47" }, | 219 | { 0x24000006, "NW-A47" }, |
220 | { 0x25000004, "NW-A55" }, | 220 | { 0x25000004, "NW-A55" }, |
221 | { 0x25000005, "NW-A56" }, | ||
221 | { 0x25000006, "NW-A57" }, | 222 | { 0x25000006, "NW-A57" }, |
222 | { 0x26000008, "DMP-Z1" }, | 223 | { 0x26000008, "DMP-Z1" }, |
223 | }; | 224 | }; |
@@ -1793,7 +1794,7 @@ static unsigned long models_nw_a30[] = { 0x22000004, 0x22000005, 0x22000006 }; | |||
1793 | 1794 | ||
1794 | static unsigned long models_nw_a40[] = { 0x24000004, 0x24000005, 0x24000006 }; | 1795 | static unsigned long models_nw_a40[] = { 0x24000004, 0x24000005, 0x24000006 }; |
1795 | 1796 | ||
1796 | static unsigned long models_nw_a50[] = { 0x25000004, 0x25000006 }; | 1797 | static unsigned long models_nw_a50[] = { 0x25000004, 0x25000005, 0x25000006 }; |
1797 | 1798 | ||
1798 | static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, | 1799 | static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, |
1799 | 0x3020001, 0x3020002, 0x3020004 }; | 1800 | 0x3020001, 0x3020002, 0x3020004 }; |
@@ -1896,7 +1897,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | |||
1896 | { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, | 1897 | { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, |
1897 | { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 }, | 1898 | { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 }, |
1898 | { "nw-a40", "NW-A40 Series", 3, models_nw_a40, &nvp_index_139d65 }, | 1899 | { "nw-a40", "NW-A40 Series", 3, models_nw_a40, &nvp_index_139d65 }, |
1899 | { "nw-a50", "NW-A50 Series", 2, models_nw_a50, &nvp_index_94b5fc }, | 1900 | { "nw-a50", "NW-A50 Series", 3, models_nw_a50, &nvp_index_94b5fc }, |
1900 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, | 1901 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, |
1901 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, &nvp_index_342a18 }, | 1902 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, &nvp_index_342a18 }, |
1902 | { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 }, | 1903 | { "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 afc251aa63..af2908b66f 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 | |||
157 | /* Invalid NVP index */ | 157 | /* Invalid NVP index */ |
158 | #define NWZ_NVP_INVALID -1 /* Non-existent entry */ | 158 | #define NWZ_NVP_INVALID -1 /* Non-existent entry */ |
159 | /* Number of models */ | 159 | /* Number of models */ |
160 | #define NWZ_MODEL_COUNT 196 | 160 | #define NWZ_MODEL_COUNT 197 |
161 | /* Number of series */ | 161 | /* Number of series */ |
162 | #define NWZ_SERIES_COUNT 40 | 162 | #define NWZ_SERIES_COUNT 40 |
163 | 163 | ||
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt index e6e214f2dc..efd098c1a8 100644 --- a/utils/nwztools/database/models.txt +++ b/utils/nwztools/database/models.txt | |||
@@ -191,6 +191,7 @@ | |||
191 | 0x24000005,NW-A46 | 191 | 0x24000005,NW-A46 |
192 | 0x24000006,NW-A47 | 192 | 0x24000006,NW-A47 |
193 | 0x25000004,NW-A55 | 193 | 0x25000004,NW-A55 |
194 | 0x25000005,NW-A56 | ||
194 | 0x25000006,NW-A57 | 195 | 0x25000006,NW-A57 |
195 | 0x23000007,NW-ZX300 | 196 | 0x23000007,NW-ZX300 |
196 | 0x26000008,DMP-Z1 | 197 | 0x26000008,DMP-Z1 |
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt index d10bfe2988..b40432688a 100644 --- a/utils/nwztools/database/series.txt +++ b/utils/nwztools/database/series.txt | |||
@@ -2,7 +2,7 @@ nwz-a10,NWZ-A10 Series,0x1a000001,0x1a000002,0x1a000004,0x1a000005,0x1a000006,0x | |||
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,0x24000005,0x24000006 | 4 | nw-a40,NW-A40 Series,0x24000004,0x24000005,0x24000006 |
5 | nw-a50,NW-A50 Series,0x25000004,0x25000006 | 5 | nw-a50,NW-A50 Series,0x25000004,0x25000005,0x25000006 |
6 | nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004 | 6 | nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004 |
7 | nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002 | 7 | nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002 |
8 | nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004 | 8 | nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004 |