diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2017-01-08 12:30:46 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2017-01-08 12:30:46 +0100 |
commit | 80d91e0cf5cd544aec8f081543204749c9a08238 (patch) | |
tree | 8bd3e15291123e6bf12cd56cb52901fa40ff395c | |
parent | 096ae78c20f75e11693484cbadd3f489a22641b0 (diff) | |
download | rockbox-80d91e0cf5cd544aec8f081543204749c9a08238.tar.gz rockbox-80d91e0cf5cd544aec8f081543204749c9a08238.zip |
nwztools: add A35 model and KAS
We don't know the encryption method, the KAS is completely different but it
might be useful to record it anyway for future purposes. MID extracted from
device, Japanese NW-A35.
Change-Id: I4c4bb5b063da99003b5c316061d8c490b77428a4
-rw-r--r-- | utils/nwztools/database/models.txt | 1 | ||||
-rw-r--r-- | utils/nwztools/database/nwz_db.c | 5 | ||||
-rw-r--r-- | utils/nwztools/database/nwz_db.h | 2 | ||||
-rw-r--r-- | utils/nwztools/database/series.txt | 2 | ||||
-rw-r--r-- | utils/nwztools/upgtools/upg.c | 3 |
5 files changed, 9 insertions, 4 deletions
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt index a8ac46bfc2..447b043bb1 100644 --- a/utils/nwztools/database/models.txt +++ b/utils/nwztools/database/models.txt | |||
@@ -181,3 +181,4 @@ | |||
181 | 0x1d000007,NW-A28 | 181 | 0x1d000007,NW-A28 |
182 | 0x20000007,NW-WM1A | 182 | 0x20000007,NW-WM1A |
183 | 0x21000008,NW-WM1Z | 183 | 0x21000008,NW-WM1Z |
184 | 0x22000004,NW-A35 | ||
diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c index 9e45988189..1c93739e22 100644 --- a/utils/nwztools/database/nwz_db.c +++ b/utils/nwztools/database/nwz_db.c | |||
@@ -207,6 +207,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] = | |||
207 | { 0x1d000007, "NW-A28" }, | 207 | { 0x1d000007, "NW-A28" }, |
208 | { 0x20000007, "NW-WM1A" }, | 208 | { 0x20000007, "NW-WM1A" }, |
209 | { 0x21000008, "NW-WM1Z" }, | 209 | { 0x21000008, "NW-WM1Z" }, |
210 | { 0x22000004, "NW-A35" }, | ||
210 | }; | 211 | }; |
211 | 212 | ||
212 | static int nvp_index_0ac81d[NWZ_NVP_COUNT] = | 213 | static int nvp_index_0ac81d[NWZ_NVP_COUNT] = |
@@ -1014,7 +1015,7 @@ static unsigned long models_nwz_a10[] = { 0x1a000001, 0x1a000002, 0x1a000004, | |||
1014 | static unsigned long models_nw_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004, | 1015 | static unsigned long models_nw_a20[] = { 0x1d000001, 0x1d000002, 0x1d000004, |
1015 | 0x1d000005, 0x1d000006, 0x1d000007 }; | 1016 | 0x1d000005, 0x1d000006, 0x1d000007 }; |
1016 | 1017 | ||
1017 | static unsigned long models_nw_a30[] = { }; | 1018 | static unsigned long models_nw_a30[] = { 0x22000004 }; |
1018 | 1019 | ||
1019 | static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, | 1020 | static unsigned long models_nwz_a720[] = { 0x3030001, 0x3030002, 0x3030004, |
1020 | 0x3020001, 0x3020002, 0x3020004 }; | 1021 | 0x3020001, 0x3020002, 0x3020004 }; |
@@ -1111,7 +1112,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | |||
1111 | { | 1112 | { |
1112 | { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee }, | 1113 | { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee }, |
1113 | { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, | 1114 | { "nw-a20", "NW-A20 Series", 6, models_nw_a20, &nvp_index_92faee }, |
1114 | { "nw-a30", "NW-A30 Series", 0, models_nw_a30, &nvp_index_398250 }, | 1115 | { "nw-a30", "NW-A30 Series", 1, models_nw_a30, &nvp_index_398250 }, |
1115 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, | 1116 | { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 }, |
1116 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 }, | 1117 | { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 }, |
1117 | { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 }, | 1118 | { "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 6fb742ca2a..23b83c5383 100644 --- a/utils/nwztools/database/nwz_db.h +++ b/utils/nwztools/database/nwz_db.h | |||
@@ -141,7 +141,7 @@ enum nwz_nvp_node_t | |||
141 | /* Invalid NVP index */ | 141 | /* Invalid NVP index */ |
142 | #define NWZ_NVP_INVALID -1 /* Non-existent entry */ | 142 | #define NWZ_NVP_INVALID -1 /* Non-existent entry */ |
143 | /* Number of models */ | 143 | /* Number of models */ |
144 | #define NWZ_MODEL_COUNT 183 | 144 | #define NWZ_MODEL_COUNT 184 |
145 | /* Number of series */ | 145 | /* Number of series */ |
146 | #define NWZ_SERIES_COUNT 36 | 146 | #define NWZ_SERIES_COUNT 36 |
147 | 147 | ||
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt index dff2cca4d0..8c1bdb86ed 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, | 3 | nw-a30,NW-A30 Series,0x22000004 |
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 |
diff --git a/utils/nwztools/upgtools/upg.c b/utils/nwztools/upgtools/upg.c index a792669c55..2154dddb5b 100644 --- a/utils/nwztools/upgtools/upg.c +++ b/utils/nwztools/upgtools/upg.c | |||
@@ -38,6 +38,9 @@ struct nwz_model_t g_model_list[] = | |||
38 | { "nw-a820", false, "0c9869c268e0eaa6d1ba62daab09cebc" }, | 38 | { "nw-a820", false, "0c9869c268e0eaa6d1ba62daab09cebc" }, |
39 | { "nw-a20", false, "e9d7185e5ac183bf26e9a5b66f983c0b" }, | 39 | { "nw-a20", false, "e9d7185e5ac183bf26e9a5b66f983c0b" }, |
40 | { "nwz-zx100", false, "2c0bf029804f73e073154388743f84d2" }, | 40 | { "nwz-zx100", false, "2c0bf029804f73e073154388743f84d2" }, |
41 | /* The following models use a different encryption, but we put the KAS here | ||
42 | * to not forget them */ | ||
43 | { "nw-a30", false, "c40d91e7efff3e3aa5c8831dd85526fe4972086283419c8cd8fa3b7dcd39" }, | ||
41 | { 0 } | 44 | { 0 } |
42 | }; | 45 | }; |
43 | 46 | ||