diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2017-06-05 16:10:53 -0500 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2017-06-05 16:17:13 -0500 |
commit | 28c3f6b4d3c4546be968b473639fea06b0177877 (patch) | |
tree | 64754cf43f1d371c311b1f82c9f330feb2b23359 /utils | |
parent | 552a271c6fea8d36390858ca6d12c4c98f663002 (diff) | |
download | rockbox-28c3f6b4d3c4546be968b473639fea06b0177877.tar.gz rockbox-28c3f6b4d3c4546be968b473639fea06b0177877.zip |
Add NW-A36 and NW-A37 model IDs, based on the A30 service manual.
I am unsure about the names of the player, the manual says A36HN and A37HN but
at the same time there is a A35 and A35HN with the same ID, and Sony does not
usually put the "HN" in its device list.
Change-Id: Idbf32970aa334b30f1b8947a78b8eebd524b193b
Diffstat (limited to 'utils')
-rw-r--r-- | utils/nwztools/database/models.txt | 2 | ||||
-rw-r--r-- | utils/nwztools/database/nwz_db.c | 6 | ||||
-rw-r--r-- | utils/nwztools/database/nwz_db.h | 2 | ||||
-rw-r--r-- | utils/nwztools/database/series.txt | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt index 447b043bb1..cd9f547f2d 100644 --- a/utils/nwztools/database/models.txt +++ b/utils/nwztools/database/models.txt | |||
@@ -182,3 +182,5 @@ | |||
182 | 0x20000007,NW-WM1A | 182 | 0x20000007,NW-WM1A |
183 | 0x21000008,NW-WM1Z | 183 | 0x21000008,NW-WM1Z |
184 | 0x22000004,NW-A35 | 184 | 0x22000004,NW-A35 |
185 | 0x22000005,NW-A36 | ||
186 | 0x22000006,NW-A37 | ||
diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c index e77b86e729..ba1a64ac5a 100644 --- a/utils/nwztools/database/nwz_db.c +++ b/utils/nwztools/database/nwz_db.c | |||
@@ -208,6 +208,8 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] = | |||
208 | { 0x20000007, "NW-WM1A" }, | 208 | { 0x20000007, "NW-WM1A" }, |
209 | { 0x21000008, "NW-WM1Z" }, | 209 | { 0x21000008, "NW-WM1Z" }, |
210 | { 0x22000004, "NW-A35" }, | 210 | { 0x22000004, "NW-A35" }, |
211 | { 0x22000005, "NW-A36" }, | ||
212 | { 0x22000006, "NW-A37" }, | ||
211 | }; | 213 | }; |
212 | 214 | ||
213 | static int nvp_index_0ac81d[NWZ_NVP_COUNT] = | 215 | static int nvp_index_0ac81d[NWZ_NVP_COUNT] = |
@@ -1201,7 +1203,7 @@ static unsigned long models_nwz_a10[] = { 0x1a000001, 0x1a000002, 0x1a000004, | |||
1201 | static unsigned long models_nw_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004, | 1203 | static unsigned long models_nw_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004, |
1202 | 0x1d000005, 0x1d000006, 0x1d000007 }; | 1204 | 0x1d000005, 0x1d000006, 0x1d000007 }; |
1203 | 1205 | ||
1204 | static unsigned long models_nw_a30[] = { 0x22000004 }; | 1206 | static unsigned long models_nw_a30[] = { 0x22000004, 0x22000005, 0x22000006 }; |
1205 | 1207 | ||
1206 | static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, | 1208 | static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, |
1207 | 0x3020001, 0x3020002, 0x3020004 }; | 1209 | 0x3020001, 0x3020002, 0x3020004 }; |
@@ -1298,7 +1300,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | |||
1298 | { | 1300 | { |
1299 | { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee }, | 1301 | { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee }, |
1300 | { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, | 1302 | { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, |
1301 | { "nw-a30", "NW-A30 Series", 1, models_nw_a30, &nvp_index_398250 }, | 1303 | { "nw-a30", "NW-A30 Series", 3, models_nw_a30, &nvp_index_398250 }, |
1302 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, | 1304 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, |
1303 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 }, | 1305 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 }, |
1304 | { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 }, | 1306 | { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 }, |
diff --git a/utils/nwztools/database/nwz_db.h b/utils/nwztools/database/nwz_db.h index 2e05dd0968..cb130f96a2 100644 --- a/utils/nwztools/database/nwz_db.h +++ b/utils/nwztools/database/nwz_db.h | |||
@@ -150,7 +150,7 @@ enum nwz_nvp_node_t | |||
150 | /* Invalid NVP index */ | 150 | /* Invalid NVP index */ |
151 | #define NWZ_NVP_INVALID -1 /* Non-existent entry */ | 151 | #define NWZ_NVP_INVALID -1 /* Non-existent entry */ |
152 | /* Number of models */ | 152 | /* Number of models */ |
153 | #define NWZ_MODEL_COUNT 184 | 153 | #define NWZ_MODEL_COUNT 186 |
154 | /* Number of series */ | 154 | /* Number of series */ |
155 | #define NWZ_SERIES_COUNT 36 | 155 | #define NWZ_SERIES_COUNT 36 |
156 | 156 | ||
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt index bba140323b..2128ad2abb 100644 --- a/utils/nwztools/database/series.txt +++ b/utils/nwztools/database/series.txt | |||
@@ -1,6 +1,6 @@ | |||
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 | 3 | nw-a30,NW-A30 Series,0x22000004,0x22000005,0x22000006 |
4 | nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004 | 4 | nwz-a720,NWZ-A720 Series,0x3030001,0x3030002,0x3030004,0x3020001,0x3020002,0x3020004 |
5 | nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002 | 5 | nwz-a810,NWZ-A810 Series,0x10000,0x10001,0x10002 |
6 | nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004 | 6 | nwz-a820,NWZ-A820 Series,0x3010001,0x3010002,0x3010004,0x3000001,0x3000002,0x3000004 |