diff options
-rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.c | 7 | ||||
-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, 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] = | |||
88 | { 0x6030002, "NW-S744" }, | 88 | { 0x6030002, "NW-S744" }, |
89 | { 0x6030004, "NW-S745" }, | 89 | { 0x6030004, "NW-S745" }, |
90 | { 0x6030005, "NW-S746" }, | 90 | { 0x6030005, "NW-S746" }, |
91 | { 0x7000002, "NWZ-A844" }, | ||
91 | { 0x7000004, "NWZ-A845" }, | 92 | { 0x7000004, "NWZ-A845" }, |
92 | { 0x7000005, "NWZ-A846" }, | 93 | { 0x7000005, "NWZ-A846" }, |
93 | { 0x7000006, "NWZ-A847" }, | 94 | { 0x7000006, "NWZ-A847" }, |
@@ -1799,8 +1800,8 @@ static unsigned long models_nwz_a810[] = { 0x10000, 0x10001, 0x10002 }; | |||
1799 | static unsigned long models_nwz_a820[] = { 0x3010001, 0x3010002, 0x3010004, | 1800 | static unsigned long models_nwz_a820[] = { 0x3010001, 0x3010002, 0x3010004, |
1800 | 0x3000001, 0x3000002, 0x3000004 }; | 1801 | 0x3000001, 0x3000002, 0x3000004 }; |
1801 | 1802 | ||
1802 | static unsigned long models_nwz_a840[] = { 0x7010004, 0x7010005, 0x7010006, | 1803 | static unsigned long models_nwz_a840[] = { 0x7000002, 0x7010004, 0x7010005, |
1803 | 0x7000004, 0x7000005, 0x7000006 }; | 1804 | 0x7010006, 0x7000004, 0x7000005, 0x7000006 }; |
1804 | 1805 | ||
1805 | static unsigned long models_nwz_a850[] = { 0xe000004, 0xe000005, 0xe000006 }; | 1806 | static unsigned long models_nwz_a850[] = { 0xe000004, 0xe000005, 0xe000006 }; |
1806 | 1807 | ||
@@ -1894,7 +1895,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | |||
1894 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, | 1895 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, |
1895 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, &nvp_index_342a18 }, | 1896 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, &nvp_index_342a18 }, |
1896 | { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 }, | 1897 | { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 }, |
1897 | { "nwz-a840", "NWZ-A840 Series", 6, models_nwz_a840, &nvp_index_0ac81d }, | 1898 | { "nwz-a840", "NWZ-A840 Series", 7, models_nwz_a840, &nvp_index_0ac81d }, |
1898 | { "nwz-a850", "NWZ-A850 Series", 3, models_nwz_a850, &nvp_index_0ac81d }, | 1899 | { "nwz-a850", "NWZ-A850 Series", 3, models_nwz_a850, &nvp_index_0ac81d }, |
1899 | { "nwz-a860", "NWZ-A860 Series", 15, models_nwz_a860, &nvp_index_f505c8 }, | 1900 | { "nwz-a860", "NWZ-A860 Series", 15, models_nwz_a860, &nvp_index_f505c8 }, |
1900 | { "nw-a910", "NW-A910 Series", 3, models_nw_a910, 0 }, | 1901 | { "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 | |||
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 192 | 160 | #define NWZ_MODEL_COUNT 193 |
161 | /* Number of series */ | 161 | /* Number of series */ |
162 | #define NWZ_SERIES_COUNT 39 | 162 | #define NWZ_SERIES_COUNT 39 |
163 | 163 | ||
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 @@ | |||
62 | 0x6030002,NW-S744 | 62 | 0x6030002,NW-S744 |
63 | 0x6030004,NW-S745 | 63 | 0x6030004,NW-S745 |
64 | 0x6030005,NW-S746 | 64 | 0x6030005,NW-S746 |
65 | 0x7000002,NWZ-A844 | ||
65 | 0x7000004,NWZ-A845 | 66 | 0x7000004,NWZ-A845 |
66 | 0x7000005,NWZ-A846 | 67 | 0x7000005,NWZ-A846 |
67 | 0x7000006,NWZ-A847 | 68 | 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 | |||
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 |
9 | nwz-a840,NWZ-A840 Series,0x7010004,0x7010005,0x7010006,0x7000004,0x7000005,0x7000006 | 9 | nwz-a840,NWZ-A840 Series,0x7000002,0x7010004,0x7010005,0x7010006,0x7000004,0x7000005,0x7000006 |
10 | nwz-a850,NWZ-A850 Series,0xe000004,0xe000005,0xe000006 | 10 | nwz-a850,NWZ-A850 Series,0xe000004,0xe000005,0xe000006 |
11 | nwz-a860,NWZ-A860 Series,0x11000001,0x11000002,0x11000004,0x11000005,0x11000006,0x11010001,0x11010002,0x11010004,0x11010005,0x11010006,0x11020001,0x11020002,0x11020004,0x11020005,0x11020006 | 11 | nwz-a860,NWZ-A860 Series,0x11000001,0x11000002,0x11000004,0x11000005,0x11000006,0x11010001,0x11010002,0x11010004,0x11010005,0x11010006,0x11020001,0x11020002,0x11020004,0x11020005,0x11020006 |
12 | nw-a910,NW-A910 Series,0x2000001,0x2000002,0x2000004 | 12 | nw-a910,NW-A910 Series,0x2000001,0x2000002,0x2000004 |