diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2017-01-07 17:32:47 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2017-01-07 17:32:47 +0100 |
commit | be68b6a7bdaddc49676c6220b86f696caf69b1b8 (patch) | |
tree | cc1e1ae87d79454053e37e809bfec1a08ddbdc48 /utils/nwztools/database/nwz_db.c | |
parent | 76c73c707abf950752f1fa0f17a049bdbbb3d5f8 (diff) | |
download | rockbox-be68b6a7bdaddc49676c6220b86f696caf69b1b8.tar.gz rockbox-be68b6a7bdaddc49676c6220b86f696caf69b1b8.zip |
nwztools: add NW-WM1A/Z model IDs
Also fix code that was supposed to sort things deterministically and was a
massive failure.
Change-Id: Iedf25f05a94ef51421710a283eb60f33ee977de1
Diffstat (limited to 'utils/nwztools/database/nwz_db.c')
-rw-r--r-- | utils/nwztools/database/nwz_db.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c index ec5845117b..083f41b39b 100644 --- a/utils/nwztools/database/nwz_db.c +++ b/utils/nwztools/database/nwz_db.c | |||
@@ -205,6 +205,8 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] = | |||
205 | { 0x1d000005, "NW-A26" }, | 205 | { 0x1d000005, "NW-A26" }, |
206 | { 0x1d000006, "NW-A27" }, | 206 | { 0x1d000006, "NW-A27" }, |
207 | { 0x1d000007, "NW-A28" }, | 207 | { 0x1d000007, "NW-A28" }, |
208 | { 0x20000007, "NW-WM1A" }, | ||
209 | { 0x21000008, "NW-WM1Z" }, | ||
208 | }; | 210 | }; |
209 | 211 | ||
210 | static int nvp_index_0ac81d[NWZ_NVP_COUNT] = | 212 | static int nvp_index_0ac81d[NWZ_NVP_COUNT] = |
@@ -1026,12 +1028,12 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] = | |||
1026 | [NWZ_NVP_BTI] = { "bti", 262144, "boot image" }, | 1028 | [NWZ_NVP_BTI] = { "bti", 262144, "boot image" }, |
1027 | [NWZ_NVP_CGP] = { "cgp", 0, "" }, | 1029 | [NWZ_NVP_CGP] = { "cgp", 0, "" }, |
1028 | [NWZ_NVP_CLV] = { "clv", 4, "color variation" }, | 1030 | [NWZ_NVP_CLV] = { "clv", 4, "color variation" }, |
1029 | [NWZ_NVP_CNG] = { "cng", 704, "aad/empr key | aad key" }, | 1031 | [NWZ_NVP_CNG] = { "cng", 704, "aad key | aad/empr key" }, |
1030 | [NWZ_NVP_CTR] = { "ctr", 0, "" }, | 1032 | [NWZ_NVP_CTR] = { "ctr", 0, "" }, |
1031 | [NWZ_NVP_DBA] = { "dba", 160, "aad icv" }, | 1033 | [NWZ_NVP_DBA] = { "dba", 160, "aad icv" }, |
1032 | [NWZ_NVP_DBG] = { "dbg", 0, "" }, | 1034 | [NWZ_NVP_DBG] = { "dbg", 0, "" }, |
1033 | [NWZ_NVP_DBI] = { "dbi", 262144, "dead battery image" }, | 1035 | [NWZ_NVP_DBI] = { "dbi", 262144, "dead battery image" }, |
1034 | [NWZ_NVP_DBV] = { "dbv", 520, "empr key | empr icv" }, | 1036 | [NWZ_NVP_DBV] = { "dbv", 520, "empr icv | empr key" }, |
1035 | [NWZ_NVP_DCC] = { "dcc", 20, "secure clock" }, | 1037 | [NWZ_NVP_DCC] = { "dcc", 20, "secure clock" }, |
1036 | [NWZ_NVP_DOR] = { "dor", 4, "key mode (debug/release)" }, | 1038 | [NWZ_NVP_DOR] = { "dor", 4, "key mode (debug/release)" }, |
1037 | [NWZ_NVP_E00] = { "e00", 1024, "EMPR 0" }, | 1039 | [NWZ_NVP_E00] = { "e00", 1024, "EMPR 0" }, |
@@ -1102,7 +1104,7 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] = | |||
1102 | [NWZ_NVP_PSK] = { "psk", 512, "bluetooth pskey" }, | 1104 | [NWZ_NVP_PSK] = { "psk", 512, "bluetooth pskey" }, |
1103 | [NWZ_NVP_PTS] = { "pts", 4, "wifi protected setup" }, | 1105 | [NWZ_NVP_PTS] = { "pts", 4, "wifi protected setup" }, |
1104 | [NWZ_NVP_RBT] = { "rbt", 0, "" }, | 1106 | [NWZ_NVP_RBT] = { "rbt", 0, "" }, |
1105 | [NWZ_NVP_RND] = { "rnd", 64, "wmt key | random data" }, | 1107 | [NWZ_NVP_RND] = { "rnd", 64, "random data | wmt key" }, |
1106 | [NWZ_NVP_RTC] = { "rtc", 16, "rtc alarm" }, | 1108 | [NWZ_NVP_RTC] = { "rtc", 16, "rtc alarm" }, |
1107 | [NWZ_NVP_SDC] = { "sdc", 4, "SD Card export flag" }, | 1109 | [NWZ_NVP_SDC] = { "sdc", 4, "SD Card export flag" }, |
1108 | [NWZ_NVP_SDP] = { "sdp", 64, "sound driver parameter" }, | 1110 | [NWZ_NVP_SDP] = { "sdp", 64, "sound driver parameter" }, |
@@ -1217,7 +1219,7 @@ static unsigned long models_nwz_s770[] = { 0x16000001, 0x16000002, 0x16000004, | |||
1217 | static unsigned long models_nw_s780[] = { 0x19000001, 0x19000002, 0x19000004, | 1219 | static unsigned long models_nw_s780[] = { 0x19000001, 0x19000002, 0x19000004, |
1218 | 0x19000005 }; | 1220 | 0x19000005 }; |
1219 | 1221 | ||
1220 | static unsigned long models_nw_wm1[] = { }; | 1222 | static unsigned long models_nw_wm1[] = { 0x20000007, 0x21000008 }; |
1221 | 1223 | ||
1222 | static unsigned long models_nwz_x1000[] = { 0x5000002, 0x5000004, 0x5000005, | 1224 | static unsigned long models_nwz_x1000[] = { 0x5000002, 0x5000004, 0x5000005, |
1223 | 0x5020002, 0x5040002, 0x5020004, 0x5040004, 0x5020005, 0x5040005 }; | 1225 | 0x5020002, 0x5040002, 0x5020004, 0x5040004, 0x5020005, 0x5040005 }; |
@@ -1263,7 +1265,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | |||
1263 | { "nwz-s760", "NWZ-S740 Series", 10, models_nwz_s760, &nvp_index_f505c8 }, | 1265 | { "nwz-s760", "NWZ-S740 Series", 10, models_nwz_s760, &nvp_index_f505c8 }, |
1264 | { "nwz-s770", "NWZ-S770 Series", 8, models_nwz_s770, 0 }, | 1266 | { "nwz-s770", "NWZ-S770 Series", 8, models_nwz_s770, 0 }, |
1265 | { "nw-s780", "NW-S780 Series", 4, models_nw_s780, &nvp_index_6485c8 }, | 1267 | { "nw-s780", "NW-S780 Series", 4, models_nw_s780, &nvp_index_6485c8 }, |
1266 | { "nw-wm1", "NW-WM1 Series", 0, models_nw_wm1, &nvp_index_398250 }, | 1268 | { "nw-wm1", "NW-WM1 Series", 2, models_nw_wm1, &nvp_index_398250 }, |
1267 | { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, 0 }, | 1269 | { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, 0 }, |
1268 | { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, 0 }, | 1270 | { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, 0 }, |
1269 | { "nwz-zx2", "NW-ZX2", 0, models_nwz_zx2, &nvp_index_c8fc85 }, | 1271 | { "nwz-zx2", "NW-ZX2", 0, models_nwz_zx2, &nvp_index_c8fc85 }, |