diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2018-10-29 13:29:39 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2018-10-29 13:29:39 +0100 |
commit | 8a4cb5e619c23473d6fda855c80d9f428478481c (patch) | |
tree | 6cb19075f63b37be0078b79d2887d0938c296ebd | |
parent | 73f2bd9c4653498e029fcb857f43469910e886d4 (diff) | |
download | rockbox-8a4cb5e619c23473d6fda855c80d9f428478481c.tar.gz rockbox-8a4cb5e619c23473d6fda855c80d9f428478481c.zip |
sonynwz: add NW-A55 to database
Change-Id: I59861119c59490f586b3c6ed32a1c41df8b3d365
-rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.c | 4 | ||||
-rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.h | 4 | ||||
-rw-r--r-- | utils/nwztools/database/models.txt | 1 | ||||
-rw-r--r-- | utils/nwztools/database/series.txt | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/firmware/target/hosted/sonynwz/nwz-db.c b/firmware/target/hosted/sonynwz/nwz-db.c index 96a6ac41d3..9b98397524 100644 --- a/firmware/target/hosted/sonynwz/nwz-db.c +++ b/firmware/target/hosted/sonynwz/nwz-db.c | |||
@@ -215,6 +215,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] = | |||
215 | { 0x24000004, "NW-A45" }, | 215 | { 0x24000004, "NW-A45" }, |
216 | { 0x24000005, "NW-A46" }, | 216 | { 0x24000005, "NW-A46" }, |
217 | { 0x24000006, "NW-A47" }, | 217 | { 0x24000006, "NW-A47" }, |
218 | { 0x25000004, "NW-A55" }, | ||
218 | }; | 219 | }; |
219 | 220 | ||
220 | static int nvp_index_06a782[NWZ_NVP_COUNT] = | 221 | static int nvp_index_06a782[NWZ_NVP_COUNT] = |
@@ -1603,6 +1604,8 @@ static unsigned long models_nw_a30[] = { 0x22000004, 0x22000005, 0x22000006 }; | |||
1603 | 1604 | ||
1604 | static unsigned long models_nw_a40[] = { 0x24000004, 0x24000005, 0x24000006 }; | 1605 | static unsigned long models_nw_a40[] = { 0x24000004, 0x24000005, 0x24000006 }; |
1605 | 1606 | ||
1607 | static unsigned long models_nw_a50[] = { 0x25000004 }; | ||
1608 | |||
1606 | static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, | 1609 | static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, |
1607 | 0x3020001, 0x3020002, 0x3020004 }; | 1610 | 0x3020001, 0x3020002, 0x3020004 }; |
1608 | 1611 | ||
@@ -1702,6 +1705,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | |||
1702 | { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, | 1705 | { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, |
1703 | { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 }, | 1706 | { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 }, |
1704 | { "nw-a40", "NW-A40 Series", 3, models_nw_a40, &nvp_index_139d65 }, | 1707 | { "nw-a40", "NW-A40 Series", 3, models_nw_a40, &nvp_index_139d65 }, |
1708 | { "nw-a50", "NW-A50 Series", 1, models_nw_a50, 0 }, | ||
1705 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, | 1709 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, |
1706 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, &nvp_index_342a18 }, | 1710 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, &nvp_index_342a18 }, |
1707 | { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 }, | 1711 | { "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 8d42c54194..c17f7fd961 100644 --- a/firmware/target/hosted/sonynwz/nwz-db.h +++ b/firmware/target/hosted/sonynwz/nwz-db.h | |||
@@ -152,9 +152,9 @@ 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 191 | 155 | #define NWZ_MODEL_COUNT 192 |
156 | /* Number of series */ | 156 | /* Number of series */ |
157 | #define NWZ_SERIES_COUNT 38 | 157 | #define NWZ_SERIES_COUNT 39 |
158 | 158 | ||
159 | /* NVP node info */ | 159 | /* NVP node info */ |
160 | struct nwz_nvp_info_t | 160 | struct nwz_nvp_info_t |
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt index d618b3d83c..f691a6df4d 100644 --- a/utils/nwztools/database/models.txt +++ b/utils/nwztools/database/models.txt | |||
@@ -189,3 +189,4 @@ | |||
189 | 0x24000004,NW-A45 | 189 | 0x24000004,NW-A45 |
190 | 0x24000005,NW-A46 | 190 | 0x24000005,NW-A46 |
191 | 0x24000006,NW-A47 | 191 | 0x24000006,NW-A47 |
192 | 0x25000004,NW-A55 | ||
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt index 25c2f50a3a..d914588ef3 100644 --- a/utils/nwztools/database/series.txt +++ b/utils/nwztools/database/series.txt | |||
@@ -2,6 +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 | ||
5 | nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004 | 6 | nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004 |
6 | nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002 | 7 | nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002 |
7 | nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004 | 8 | nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004 |