diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2017-01-04 16:30:30 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2017-01-04 17:03:54 +0100 |
commit | bfd5704749cfb8f7faf9f03be49c60f5f2b1cf7d (patch) | |
tree | c58af207ec3edfa40ea12107a61b119f117425ba /utils | |
parent | 3c3e133f99f38f9746df7c51ded6671ffa987504 (diff) | |
download | rockbox-bfd5704749cfb8f7faf9f03be49c60f5f2b1cf7d.tar.gz rockbox-bfd5704749cfb8f7faf9f03be49c60f5f2b1cf7d.zip |
nwztools: add NW-WM1 nvp table, regenerate database
Change-Id: If5781f0a98b3f2fee08a2daed383064cc59f1680
Diffstat (limited to 'utils')
-rw-r--r-- | utils/nwztools/database/nvp/nw-wm1.txt | 92 | ||||
-rw-r--r-- | utils/nwztools/database/nwz_db.c | 353 | ||||
-rw-r--r-- | utils/nwztools/database/nwz_db.h | 4 | ||||
-rw-r--r-- | utils/nwztools/database/series.txt | 1 |
4 files changed, 273 insertions, 177 deletions
diff --git a/utils/nwztools/database/nvp/nw-wm1.txt b/utils/nwztools/database/nvp/nw-wm1.txt new file mode 100644 index 0000000000..dd058fb15e --- /dev/null +++ b/utils/nwztools/database/nvp/nw-wm1.txt | |||
@@ -0,0 +1,92 @@ | |||
1 | dbg,000 | ||
2 | syi,001 | ||
3 | ubp,002 | ||
4 | fup,003 | ||
5 | prk,004 | ||
6 | hld,005 | ||
7 | rtc,006 | ||
8 | mid,007 | ||
9 | pcd,008 | ||
10 | ser,009 | ||
11 | ufn,010 | ||
12 | kas,011 | ||
13 | shp,012 | ||
14 | tst,013 | ||
15 | gty,014 | ||
16 | fmp,015 | ||
17 | sdp,016 | ||
18 | ncp,017 | ||
19 | psk,018 | ||
20 | nvr,077 | ||
21 | she,084 | ||
22 | btc,085 | ||
23 | ins,089 | ||
24 | ctr,090 | ||
25 | sku,091 | ||
26 | bpr,019 | ||
27 | bfp,020 | ||
28 | bfd,021 | ||
29 | bml,022 | ||
30 | apd,078 | ||
31 | blf,079 | ||
32 | slp,080 | ||
33 | vrt,081 | ||
34 | fni,082 | ||
35 | sid,083 | ||
36 | mso,086 | ||
37 | cng,023 | ||
38 | lyr,024 | ||
39 | dbv,025 | ||
40 | fur,026 | ||
41 | ums,027 | ||
42 | skd,028 | ||
43 | ups,029 | ||
44 | mdk,030 | ||
45 | fvi,031 | ||
46 | mac,032 | ||
47 | fpi,033 | ||
48 | tr0,034 | ||
49 | tr1,035 | ||
50 | e00,036 | ||
51 | e01,037 | ||
52 | e02,038 | ||
53 | e03,039 | ||
54 | e04,040 | ||
55 | e05,041 | ||
56 | e06,042 | ||
57 | e07,043 | ||
58 | e08,044 | ||
59 | e09,045 | ||
60 | e10,046 | ||
61 | e11,047 | ||
62 | e12,048 | ||
63 | e13,049 | ||
64 | e14,050 | ||
65 | e15,051 | ||
66 | e16,052 | ||
67 | e17,053 | ||
68 | e18,054 | ||
69 | e19,055 | ||
70 | e20,056 | ||
71 | e21,057 | ||
72 | e22,058 | ||
73 | e23,059 | ||
74 | e24,060 | ||
75 | e25,061 | ||
76 | e26,062 | ||
77 | e27,063 | ||
78 | e28,064 | ||
79 | e29,065 | ||
80 | e30,066 | ||
81 | e31,067 | ||
82 | clv,068 | ||
83 | sps,069 | ||
84 | rbt,070 | ||
85 | edw,071 | ||
86 | bti,072 | ||
87 | hdi,073 | ||
88 | lbi,074 | ||
89 | fui,075 | ||
90 | eri,076 | ||
91 | pci,087 | ||
92 | dbi,088 | ||
diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c index 3288fc1bec..ec5845117b 100644 --- a/utils/nwztools/database/nwz_db.c +++ b/utils/nwztools/database/nwz_db.c | |||
@@ -207,121 +207,6 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] = | |||
207 | { 0x1d000007, "NW-A28" }, | 207 | { 0x1d000007, "NW-A28" }, |
208 | }; | 208 | }; |
209 | 209 | ||
210 | static int nvp_index_28dc2c[NWZ_NVP_COUNT] = | ||
211 | { | ||
212 | [NWZ_NVP_APD] = 78, | ||
213 | [NWZ_NVP_APP] = NWZ_NVP_INVALID, | ||
214 | [NWZ_NVP_BFD] = 21, | ||
215 | [NWZ_NVP_BFP] = 20, | ||
216 | [NWZ_NVP_BLF] = 79, | ||
217 | [NWZ_NVP_BML] = 22, | ||
218 | [NWZ_NVP_BOK] = 4, | ||
219 | [NWZ_NVP_BPR] = 19, | ||
220 | [NWZ_NVP_BTC] = 85, | ||
221 | [NWZ_NVP_BTI] = 72, | ||
222 | [NWZ_NVP_CGP] = NWZ_NVP_INVALID, | ||
223 | [NWZ_NVP_CLV] = 68, | ||
224 | [NWZ_NVP_CNG] = 23, | ||
225 | [NWZ_NVP_CTR] = NWZ_NVP_INVALID, | ||
226 | [NWZ_NVP_DBA] = 24, | ||
227 | [NWZ_NVP_DBG] = 0, | ||
228 | [NWZ_NVP_DBI] = NWZ_NVP_INVALID, | ||
229 | [NWZ_NVP_DBV] = 25, | ||
230 | [NWZ_NVP_DCC] = 31, | ||
231 | [NWZ_NVP_DOR] = 26, | ||
232 | [NWZ_NVP_E00] = 36, | ||
233 | [NWZ_NVP_E01] = 37, | ||
234 | [NWZ_NVP_E02] = 38, | ||
235 | [NWZ_NVP_E03] = 39, | ||
236 | [NWZ_NVP_E04] = 40, | ||
237 | [NWZ_NVP_E05] = 41, | ||
238 | [NWZ_NVP_E06] = 42, | ||
239 | [NWZ_NVP_E07] = 43, | ||
240 | [NWZ_NVP_E08] = 44, | ||
241 | [NWZ_NVP_E09] = 45, | ||
242 | [NWZ_NVP_E10] = 46, | ||
243 | [NWZ_NVP_E11] = 47, | ||
244 | [NWZ_NVP_E12] = 48, | ||
245 | [NWZ_NVP_E13] = 49, | ||
246 | [NWZ_NVP_E14] = 50, | ||
247 | [NWZ_NVP_E15] = 51, | ||
248 | [NWZ_NVP_E16] = 52, | ||
249 | [NWZ_NVP_E17] = 53, | ||
250 | [NWZ_NVP_E18] = 54, | ||
251 | [NWZ_NVP_E19] = 55, | ||
252 | [NWZ_NVP_E20] = 56, | ||
253 | [NWZ_NVP_E21] = 57, | ||
254 | [NWZ_NVP_E22] = 58, | ||
255 | [NWZ_NVP_E23] = 59, | ||
256 | [NWZ_NVP_E24] = 60, | ||
257 | [NWZ_NVP_E25] = 61, | ||
258 | [NWZ_NVP_E26] = 62, | ||
259 | [NWZ_NVP_E27] = 63, | ||
260 | [NWZ_NVP_E28] = 64, | ||
261 | [NWZ_NVP_E29] = 65, | ||
262 | [NWZ_NVP_E30] = 66, | ||
263 | [NWZ_NVP_E31] = 67, | ||
264 | [NWZ_NVP_EDW] = 71, | ||
265 | [NWZ_NVP_ERI] = 76, | ||
266 | [NWZ_NVP_EXM] = NWZ_NVP_INVALID, | ||
267 | [NWZ_NVP_FMP] = 15, | ||
268 | [NWZ_NVP_FNI] = 82, | ||
269 | [NWZ_NVP_FPI] = NWZ_NVP_INVALID, | ||
270 | [NWZ_NVP_FUI] = 75, | ||
271 | [NWZ_NVP_FUP] = 3, | ||
272 | [NWZ_NVP_FUR] = NWZ_NVP_INVALID, | ||
273 | [NWZ_NVP_FVI] = NWZ_NVP_INVALID, | ||
274 | [NWZ_NVP_GTY] = 14, | ||
275 | [NWZ_NVP_HDI] = 73, | ||
276 | [NWZ_NVP_HLD] = 5, | ||
277 | [NWZ_NVP_INS] = NWZ_NVP_INVALID, | ||
278 | [NWZ_NVP_IPT] = NWZ_NVP_INVALID, | ||
279 | [NWZ_NVP_KAS] = 11, | ||
280 | [NWZ_NVP_LBI] = 74, | ||
281 | [NWZ_NVP_LYR] = NWZ_NVP_INVALID, | ||
282 | [NWZ_NVP_MAC] = NWZ_NVP_INVALID, | ||
283 | [NWZ_NVP_MCR] = NWZ_NVP_INVALID, | ||
284 | [NWZ_NVP_MDK] = 30, | ||
285 | [NWZ_NVP_MDL] = 70, | ||
286 | [NWZ_NVP_MID] = 7, | ||
287 | [NWZ_NVP_MLK] = 84, | ||
288 | [NWZ_NVP_MSC] = NWZ_NVP_INVALID, | ||
289 | [NWZ_NVP_MSO] = 86, | ||
290 | [NWZ_NVP_MTM] = 33, | ||
291 | [NWZ_NVP_MUK] = NWZ_NVP_INVALID, | ||
292 | [NWZ_NVP_NCP] = 17, | ||
293 | [NWZ_NVP_NVR] = NWZ_NVP_INVALID, | ||
294 | [NWZ_NVP_PCD] = 8, | ||
295 | [NWZ_NVP_PCI] = NWZ_NVP_INVALID, | ||
296 | [NWZ_NVP_PRK] = NWZ_NVP_INVALID, | ||
297 | [NWZ_NVP_PSK] = 18, | ||
298 | [NWZ_NVP_PTS] = 77, | ||
299 | [NWZ_NVP_RBT] = NWZ_NVP_INVALID, | ||
300 | [NWZ_NVP_RND] = 27, | ||
301 | [NWZ_NVP_RTC] = 6, | ||
302 | [NWZ_NVP_SDC] = NWZ_NVP_INVALID, | ||
303 | [NWZ_NVP_SDP] = 16, | ||
304 | [NWZ_NVP_SER] = 9, | ||
305 | [NWZ_NVP_SFI] = 29, | ||
306 | [NWZ_NVP_SHE] = NWZ_NVP_INVALID, | ||
307 | [NWZ_NVP_SHP] = 12, | ||
308 | [NWZ_NVP_SID] = 83, | ||
309 | [NWZ_NVP_SKD] = 28, | ||
310 | [NWZ_NVP_SKT] = 32, | ||
311 | [NWZ_NVP_SKU] = NWZ_NVP_INVALID, | ||
312 | [NWZ_NVP_SLP] = 80, | ||
313 | [NWZ_NVP_SPS] = 69, | ||
314 | [NWZ_NVP_SYI] = 1, | ||
315 | [NWZ_NVP_TR0] = 34, | ||
316 | [NWZ_NVP_TR1] = 35, | ||
317 | [NWZ_NVP_TST] = 13, | ||
318 | [NWZ_NVP_UBP] = 2, | ||
319 | [NWZ_NVP_UFN] = 10, | ||
320 | [NWZ_NVP_UMS] = NWZ_NVP_INVALID, | ||
321 | [NWZ_NVP_UPS] = NWZ_NVP_INVALID, | ||
322 | [NWZ_NVP_VRT] = 81, | ||
323 | }; | ||
324 | |||
325 | static int nvp_index_0ac81d[NWZ_NVP_COUNT] = | 210 | static int nvp_index_0ac81d[NWZ_NVP_COUNT] = |
326 | { | 211 | { |
327 | [NWZ_NVP_APD] = 78, | 212 | [NWZ_NVP_APD] = 78, |
@@ -437,28 +322,28 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] = | |||
437 | [NWZ_NVP_VRT] = NWZ_NVP_INVALID, | 322 | [NWZ_NVP_VRT] = NWZ_NVP_INVALID, |
438 | }; | 323 | }; |
439 | 324 | ||
440 | static int nvp_index_f505c8[NWZ_NVP_COUNT] = | 325 | static int nvp_index_28dc2c[NWZ_NVP_COUNT] = |
441 | { | 326 | { |
442 | [NWZ_NVP_APD] = 78, | 327 | [NWZ_NVP_APD] = 78, |
443 | [NWZ_NVP_APP] = 5, | 328 | [NWZ_NVP_APP] = NWZ_NVP_INVALID, |
444 | [NWZ_NVP_BFD] = 88, | 329 | [NWZ_NVP_BFD] = 21, |
445 | [NWZ_NVP_BFP] = 89, | 330 | [NWZ_NVP_BFP] = 20, |
446 | [NWZ_NVP_BLF] = 79, | 331 | [NWZ_NVP_BLF] = 79, |
447 | [NWZ_NVP_BML] = 87, | 332 | [NWZ_NVP_BML] = 22, |
448 | [NWZ_NVP_BOK] = 10, | 333 | [NWZ_NVP_BOK] = 4, |
449 | [NWZ_NVP_BPR] = 35, | 334 | [NWZ_NVP_BPR] = 19, |
450 | [NWZ_NVP_BTC] = 27, | 335 | [NWZ_NVP_BTC] = 85, |
451 | [NWZ_NVP_BTI] = 1, | 336 | [NWZ_NVP_BTI] = 72, |
452 | [NWZ_NVP_CGP] = NWZ_NVP_INVALID, | 337 | [NWZ_NVP_CGP] = NWZ_NVP_INVALID, |
453 | [NWZ_NVP_CLV] = 68, | 338 | [NWZ_NVP_CLV] = 68, |
454 | [NWZ_NVP_CNG] = 3, | 339 | [NWZ_NVP_CNG] = 23, |
455 | [NWZ_NVP_CTR] = NWZ_NVP_INVALID, | 340 | [NWZ_NVP_CTR] = NWZ_NVP_INVALID, |
456 | [NWZ_NVP_DBA] = 12, | 341 | [NWZ_NVP_DBA] = 24, |
457 | [NWZ_NVP_DBG] = 0, | 342 | [NWZ_NVP_DBG] = 0, |
458 | [NWZ_NVP_DBI] = NWZ_NVP_INVALID, | 343 | [NWZ_NVP_DBI] = NWZ_NVP_INVALID, |
459 | [NWZ_NVP_DBV] = 13, | 344 | [NWZ_NVP_DBV] = 25, |
460 | [NWZ_NVP_DCC] = 7, | 345 | [NWZ_NVP_DCC] = 31, |
461 | [NWZ_NVP_DOR] = 21, | 346 | [NWZ_NVP_DOR] = 26, |
462 | [NWZ_NVP_E00] = 36, | 347 | [NWZ_NVP_E00] = 36, |
463 | [NWZ_NVP_E01] = 37, | 348 | [NWZ_NVP_E01] = 37, |
464 | [NWZ_NVP_E02] = 38, | 349 | [NWZ_NVP_E02] = 38, |
@@ -491,65 +376,65 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] = | |||
491 | [NWZ_NVP_E29] = 65, | 376 | [NWZ_NVP_E29] = 65, |
492 | [NWZ_NVP_E30] = 66, | 377 | [NWZ_NVP_E30] = 66, |
493 | [NWZ_NVP_E31] = 67, | 378 | [NWZ_NVP_E31] = 67, |
494 | [NWZ_NVP_EDW] = 22, | 379 | [NWZ_NVP_EDW] = 71, |
495 | [NWZ_NVP_ERI] = 6, | 380 | [NWZ_NVP_ERI] = 76, |
496 | [NWZ_NVP_EXM] = 25, | 381 | [NWZ_NVP_EXM] = NWZ_NVP_INVALID, |
497 | [NWZ_NVP_FMP] = 82, | 382 | [NWZ_NVP_FMP] = 15, |
498 | [NWZ_NVP_FNI] = NWZ_NVP_INVALID, | 383 | [NWZ_NVP_FNI] = 82, |
499 | [NWZ_NVP_FPI] = NWZ_NVP_INVALID, | 384 | [NWZ_NVP_FPI] = NWZ_NVP_INVALID, |
500 | [NWZ_NVP_FUI] = 19, | 385 | [NWZ_NVP_FUI] = 75, |
501 | [NWZ_NVP_FUP] = 9, | 386 | [NWZ_NVP_FUP] = 3, |
502 | [NWZ_NVP_FUR] = NWZ_NVP_INVALID, | 387 | [NWZ_NVP_FUR] = NWZ_NVP_INVALID, |
503 | [NWZ_NVP_FVI] = NWZ_NVP_INVALID, | 388 | [NWZ_NVP_FVI] = NWZ_NVP_INVALID, |
504 | [NWZ_NVP_GTY] = 18, | 389 | [NWZ_NVP_GTY] = 14, |
505 | [NWZ_NVP_HDI] = 2, | 390 | [NWZ_NVP_HDI] = 73, |
506 | [NWZ_NVP_HLD] = 80, | 391 | [NWZ_NVP_HLD] = 5, |
507 | [NWZ_NVP_INS] = NWZ_NVP_INVALID, | 392 | [NWZ_NVP_INS] = NWZ_NVP_INVALID, |
508 | [NWZ_NVP_IPT] = 70, | 393 | [NWZ_NVP_IPT] = NWZ_NVP_INVALID, |
509 | [NWZ_NVP_KAS] = 32, | 394 | [NWZ_NVP_KAS] = 11, |
510 | [NWZ_NVP_LBI] = 20, | 395 | [NWZ_NVP_LBI] = 74, |
511 | [NWZ_NVP_LYR] = NWZ_NVP_INVALID, | 396 | [NWZ_NVP_LYR] = NWZ_NVP_INVALID, |
512 | [NWZ_NVP_MAC] = 77, | 397 | [NWZ_NVP_MAC] = NWZ_NVP_INVALID, |
513 | [NWZ_NVP_MCR] = 72, | 398 | [NWZ_NVP_MCR] = NWZ_NVP_INVALID, |
514 | [NWZ_NVP_MDK] = 73, | 399 | [NWZ_NVP_MDK] = 30, |
515 | [NWZ_NVP_MDL] = 8, | 400 | [NWZ_NVP_MDL] = 70, |
516 | [NWZ_NVP_MID] = 16, | 401 | [NWZ_NVP_MID] = 7, |
517 | [NWZ_NVP_MLK] = NWZ_NVP_INVALID, | 402 | [NWZ_NVP_MLK] = 84, |
518 | [NWZ_NVP_MSC] = 84, | 403 | [NWZ_NVP_MSC] = NWZ_NVP_INVALID, |
519 | [NWZ_NVP_MSO] = NWZ_NVP_INVALID, | 404 | [NWZ_NVP_MSO] = 86, |
520 | [NWZ_NVP_MTM] = 71, | 405 | [NWZ_NVP_MTM] = 33, |
521 | [NWZ_NVP_MUK] = 74, | 406 | [NWZ_NVP_MUK] = NWZ_NVP_INVALID, |
522 | [NWZ_NVP_NCP] = 31, | 407 | [NWZ_NVP_NCP] = 17, |
523 | [NWZ_NVP_NVR] = NWZ_NVP_INVALID, | 408 | [NWZ_NVP_NVR] = NWZ_NVP_INVALID, |
524 | [NWZ_NVP_PCD] = 26, | 409 | [NWZ_NVP_PCD] = 8, |
525 | [NWZ_NVP_PCI] = NWZ_NVP_INVALID, | 410 | [NWZ_NVP_PCI] = NWZ_NVP_INVALID, |
526 | [NWZ_NVP_PRK] = NWZ_NVP_INVALID, | 411 | [NWZ_NVP_PRK] = NWZ_NVP_INVALID, |
527 | [NWZ_NVP_PSK] = 86, | 412 | [NWZ_NVP_PSK] = 18, |
528 | [NWZ_NVP_PTS] = 75, | 413 | [NWZ_NVP_PTS] = 77, |
529 | [NWZ_NVP_RBT] = NWZ_NVP_INVALID, | 414 | [NWZ_NVP_RBT] = NWZ_NVP_INVALID, |
530 | [NWZ_NVP_RND] = 28, | 415 | [NWZ_NVP_RND] = 27, |
531 | [NWZ_NVP_RTC] = 34, | 416 | [NWZ_NVP_RTC] = 6, |
532 | [NWZ_NVP_SDC] = NWZ_NVP_INVALID, | 417 | [NWZ_NVP_SDC] = NWZ_NVP_INVALID, |
533 | [NWZ_NVP_SDP] = 30, | 418 | [NWZ_NVP_SDP] = 16, |
534 | [NWZ_NVP_SER] = 4, | 419 | [NWZ_NVP_SER] = 9, |
535 | [NWZ_NVP_SFI] = 33, | 420 | [NWZ_NVP_SFI] = 29, |
536 | [NWZ_NVP_SHE] = NWZ_NVP_INVALID, | 421 | [NWZ_NVP_SHE] = NWZ_NVP_INVALID, |
537 | [NWZ_NVP_SHP] = 11, | 422 | [NWZ_NVP_SHP] = 12, |
538 | [NWZ_NVP_SID] = NWZ_NVP_INVALID, | 423 | [NWZ_NVP_SID] = 83, |
539 | [NWZ_NVP_SKD] = 81, | 424 | [NWZ_NVP_SKD] = 28, |
540 | [NWZ_NVP_SKT] = 76, | 425 | [NWZ_NVP_SKT] = 32, |
541 | [NWZ_NVP_SKU] = NWZ_NVP_INVALID, | 426 | [NWZ_NVP_SKU] = NWZ_NVP_INVALID, |
542 | [NWZ_NVP_SLP] = 69, | 427 | [NWZ_NVP_SLP] = 80, |
543 | [NWZ_NVP_SPS] = 83, | 428 | [NWZ_NVP_SPS] = 69, |
544 | [NWZ_NVP_SYI] = 24, | 429 | [NWZ_NVP_SYI] = 1, |
545 | [NWZ_NVP_TR0] = 14, | 430 | [NWZ_NVP_TR0] = 34, |
546 | [NWZ_NVP_TR1] = 15, | 431 | [NWZ_NVP_TR1] = 35, |
547 | [NWZ_NVP_TST] = 17, | 432 | [NWZ_NVP_TST] = 13, |
548 | [NWZ_NVP_UBP] = 23, | 433 | [NWZ_NVP_UBP] = 2, |
549 | [NWZ_NVP_UFN] = 29, | 434 | [NWZ_NVP_UFN] = 10, |
550 | [NWZ_NVP_UMS] = NWZ_NVP_INVALID, | 435 | [NWZ_NVP_UMS] = NWZ_NVP_INVALID, |
551 | [NWZ_NVP_UPS] = NWZ_NVP_INVALID, | 436 | [NWZ_NVP_UPS] = NWZ_NVP_INVALID, |
552 | [NWZ_NVP_VRT] = 85, | 437 | [NWZ_NVP_VRT] = 81, |
553 | }; | 438 | }; |
554 | 439 | ||
555 | static int nvp_index_398250[NWZ_NVP_COUNT] = | 440 | static int nvp_index_398250[NWZ_NVP_COUNT] = |
@@ -1012,6 +897,121 @@ static int nvp_index_c8fc85[NWZ_NVP_COUNT] = | |||
1012 | [NWZ_NVP_VRT] = 85, | 897 | [NWZ_NVP_VRT] = 85, |
1013 | }; | 898 | }; |
1014 | 899 | ||
900 | static int nvp_index_f505c8[NWZ_NVP_COUNT] = | ||
901 | { | ||
902 | [NWZ_NVP_APD] = 78, | ||
903 | [NWZ_NVP_APP] = 5, | ||
904 | [NWZ_NVP_BFD] = 88, | ||
905 | [NWZ_NVP_BFP] = 89, | ||
906 | [NWZ_NVP_BLF] = 79, | ||
907 | [NWZ_NVP_BML] = 87, | ||
908 | [NWZ_NVP_BOK] = 10, | ||
909 | [NWZ_NVP_BPR] = 35, | ||
910 | [NWZ_NVP_BTC] = 27, | ||
911 | [NWZ_NVP_BTI] = 1, | ||
912 | [NWZ_NVP_CGP] = NWZ_NVP_INVALID, | ||
913 | [NWZ_NVP_CLV] = 68, | ||
914 | [NWZ_NVP_CNG] = 3, | ||
915 | [NWZ_NVP_CTR] = NWZ_NVP_INVALID, | ||
916 | [NWZ_NVP_DBA] = 12, | ||
917 | [NWZ_NVP_DBG] = 0, | ||
918 | [NWZ_NVP_DBI] = NWZ_NVP_INVALID, | ||
919 | [NWZ_NVP_DBV] = 13, | ||
920 | [NWZ_NVP_DCC] = 7, | ||
921 | [NWZ_NVP_DOR] = 21, | ||
922 | [NWZ_NVP_E00] = 36, | ||
923 | [NWZ_NVP_E01] = 37, | ||
924 | [NWZ_NVP_E02] = 38, | ||
925 | [NWZ_NVP_E03] = 39, | ||
926 | [NWZ_NVP_E04] = 40, | ||
927 | [NWZ_NVP_E05] = 41, | ||
928 | [NWZ_NVP_E06] = 42, | ||
929 | [NWZ_NVP_E07] = 43, | ||
930 | [NWZ_NVP_E08] = 44, | ||
931 | [NWZ_NVP_E09] = 45, | ||
932 | [NWZ_NVP_E10] = 46, | ||
933 | [NWZ_NVP_E11] = 47, | ||
934 | [NWZ_NVP_E12] = 48, | ||
935 | [NWZ_NVP_E13] = 49, | ||
936 | [NWZ_NVP_E14] = 50, | ||
937 | [NWZ_NVP_E15] = 51, | ||
938 | [NWZ_NVP_E16] = 52, | ||
939 | [NWZ_NVP_E17] = 53, | ||
940 | [NWZ_NVP_E18] = 54, | ||
941 | [NWZ_NVP_E19] = 55, | ||
942 | [NWZ_NVP_E20] = 56, | ||
943 | [NWZ_NVP_E21] = 57, | ||
944 | [NWZ_NVP_E22] = 58, | ||
945 | [NWZ_NVP_E23] = 59, | ||
946 | [NWZ_NVP_E24] = 60, | ||
947 | [NWZ_NVP_E25] = 61, | ||
948 | [NWZ_NVP_E26] = 62, | ||
949 | [NWZ_NVP_E27] = 63, | ||
950 | [NWZ_NVP_E28] = 64, | ||
951 | [NWZ_NVP_E29] = 65, | ||
952 | [NWZ_NVP_E30] = 66, | ||
953 | [NWZ_NVP_E31] = 67, | ||
954 | [NWZ_NVP_EDW] = 22, | ||
955 | [NWZ_NVP_ERI] = 6, | ||
956 | [NWZ_NVP_EXM] = 25, | ||
957 | [NWZ_NVP_FMP] = 82, | ||
958 | [NWZ_NVP_FNI] = NWZ_NVP_INVALID, | ||
959 | [NWZ_NVP_FPI] = NWZ_NVP_INVALID, | ||
960 | [NWZ_NVP_FUI] = 19, | ||
961 | [NWZ_NVP_FUP] = 9, | ||
962 | [NWZ_NVP_FUR] = NWZ_NVP_INVALID, | ||
963 | [NWZ_NVP_FVI] = NWZ_NVP_INVALID, | ||
964 | [NWZ_NVP_GTY] = 18, | ||
965 | [NWZ_NVP_HDI] = 2, | ||
966 | [NWZ_NVP_HLD] = 80, | ||
967 | [NWZ_NVP_INS] = NWZ_NVP_INVALID, | ||
968 | [NWZ_NVP_IPT] = 70, | ||
969 | [NWZ_NVP_KAS] = 32, | ||
970 | [NWZ_NVP_LBI] = 20, | ||
971 | [NWZ_NVP_LYR] = NWZ_NVP_INVALID, | ||
972 | [NWZ_NVP_MAC] = 77, | ||
973 | [NWZ_NVP_MCR] = 72, | ||
974 | [NWZ_NVP_MDK] = 73, | ||
975 | [NWZ_NVP_MDL] = 8, | ||
976 | [NWZ_NVP_MID] = 16, | ||
977 | [NWZ_NVP_MLK] = NWZ_NVP_INVALID, | ||
978 | [NWZ_NVP_MSC] = 84, | ||
979 | [NWZ_NVP_MSO] = NWZ_NVP_INVALID, | ||
980 | [NWZ_NVP_MTM] = 71, | ||
981 | [NWZ_NVP_MUK] = 74, | ||
982 | [NWZ_NVP_NCP] = 31, | ||
983 | [NWZ_NVP_NVR] = NWZ_NVP_INVALID, | ||
984 | [NWZ_NVP_PCD] = 26, | ||
985 | [NWZ_NVP_PCI] = NWZ_NVP_INVALID, | ||
986 | [NWZ_NVP_PRK] = NWZ_NVP_INVALID, | ||
987 | [NWZ_NVP_PSK] = 86, | ||
988 | [NWZ_NVP_PTS] = 75, | ||
989 | [NWZ_NVP_RBT] = NWZ_NVP_INVALID, | ||
990 | [NWZ_NVP_RND] = 28, | ||
991 | [NWZ_NVP_RTC] = 34, | ||
992 | [NWZ_NVP_SDC] = NWZ_NVP_INVALID, | ||
993 | [NWZ_NVP_SDP] = 30, | ||
994 | [NWZ_NVP_SER] = 4, | ||
995 | [NWZ_NVP_SFI] = 33, | ||
996 | [NWZ_NVP_SHE] = NWZ_NVP_INVALID, | ||
997 | [NWZ_NVP_SHP] = 11, | ||
998 | [NWZ_NVP_SID] = NWZ_NVP_INVALID, | ||
999 | [NWZ_NVP_SKD] = 81, | ||
1000 | [NWZ_NVP_SKT] = 76, | ||
1001 | [NWZ_NVP_SKU] = NWZ_NVP_INVALID, | ||
1002 | [NWZ_NVP_SLP] = 69, | ||
1003 | [NWZ_NVP_SPS] = 83, | ||
1004 | [NWZ_NVP_SYI] = 24, | ||
1005 | [NWZ_NVP_TR0] = 14, | ||
1006 | [NWZ_NVP_TR1] = 15, | ||
1007 | [NWZ_NVP_TST] = 17, | ||
1008 | [NWZ_NVP_UBP] = 23, | ||
1009 | [NWZ_NVP_UFN] = 29, | ||
1010 | [NWZ_NVP_UMS] = NWZ_NVP_INVALID, | ||
1011 | [NWZ_NVP_UPS] = NWZ_NVP_INVALID, | ||
1012 | [NWZ_NVP_VRT] = 85, | ||
1013 | }; | ||
1014 | |||
1015 | struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] = | 1015 | struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] = |
1016 | { | 1016 | { |
1017 | [NWZ_NVP_APD] = { "apd", 4, "application debug mode flag" }, | 1017 | [NWZ_NVP_APD] = { "apd", 4, "application debug mode flag" }, |
@@ -1031,7 +1031,7 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] = | |||
1031 | [NWZ_NVP_DBA] = { "dba", 160, "aad icv" }, | 1031 | [NWZ_NVP_DBA] = { "dba", 160, "aad icv" }, |
1032 | [NWZ_NVP_DBG] = { "dbg", 0, "" }, | 1032 | [NWZ_NVP_DBG] = { "dbg", 0, "" }, |
1033 | [NWZ_NVP_DBI] = { "dbi", 262144, "dead battery image" }, | 1033 | [NWZ_NVP_DBI] = { "dbi", 262144, "dead battery image" }, |
1034 | [NWZ_NVP_DBV] = { "dbv", 520, "empr icv | empr key" }, | 1034 | [NWZ_NVP_DBV] = { "dbv", 520, "empr key | empr icv" }, |
1035 | [NWZ_NVP_DCC] = { "dcc", 20, "secure clock" }, | 1035 | [NWZ_NVP_DCC] = { "dcc", 20, "secure clock" }, |
1036 | [NWZ_NVP_DOR] = { "dor", 4, "key mode (debug/release)" }, | 1036 | [NWZ_NVP_DOR] = { "dor", 4, "key mode (debug/release)" }, |
1037 | [NWZ_NVP_E00] = { "e00", 1024, "EMPR 0" }, | 1037 | [NWZ_NVP_E00] = { "e00", 1024, "EMPR 0" }, |
@@ -1217,6 +1217,8 @@ static unsigned long models_nwz_s770[] = { 0x16000001, 0x16000002, 0x16000004, | |||
1217 | static unsigned long models_nw_s780[] = { 0x19000001, 0x19000002, 0x19000004, | 1217 | static unsigned long models_nw_s780[] = { 0x19000001, 0x19000002, 0x19000004, |
1218 | 0x19000005 }; | 1218 | 0x19000005 }; |
1219 | 1219 | ||
1220 | static unsigned long models_nw_wm1[] = { }; | ||
1221 | |||
1220 | static unsigned long models_nwz_x1000[] = { 0x5000002, 0x5000004, 0x5000005, | 1222 | static unsigned long models_nwz_x1000[] = { 0x5000002, 0x5000004, 0x5000005, |
1221 | 0x5020002, 0x5040002, 0x5020004, 0x5040004, 0x5020005, 0x5040005 }; | 1223 | 0x5020002, 0x5040002, 0x5020004, 0x5040004, 0x5020005, 0x5040005 }; |
1222 | 1224 | ||
@@ -1261,6 +1263,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | |||
1261 | { "nwz-s760", "NWZ-S740 Series", 10, models_nwz_s760, &nvp_index_f505c8 }, | 1263 | { "nwz-s760", "NWZ-S740 Series", 10, models_nwz_s760, &nvp_index_f505c8 }, |
1262 | { "nwz-s770", "NWZ-S770 Series", 8, models_nwz_s770, 0 }, | 1264 | { "nwz-s770", "NWZ-S770 Series", 8, models_nwz_s770, 0 }, |
1263 | { "nw-s780", "NW-S780 Series", 4, models_nw_s780, &nvp_index_6485c8 }, | 1265 | { "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 }, | ||
1264 | { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, 0 }, | 1267 | { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, 0 }, |
1265 | { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, 0 }, | 1268 | { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, 0 }, |
1266 | { "nwz-zx2", "NW-ZX2", 0, models_nwz_zx2, &nvp_index_c8fc85 }, | 1269 | { "nwz-zx2", "NW-ZX2", 0, models_nwz_zx2, &nvp_index_c8fc85 }, |
diff --git a/utils/nwztools/database/nwz_db.h b/utils/nwztools/database/nwz_db.h index 95aff48afa..f7af2e9a24 100644 --- a/utils/nwztools/database/nwz_db.h +++ b/utils/nwztools/database/nwz_db.h | |||
@@ -42,7 +42,7 @@ enum nwz_nvp_node_t | |||
42 | NWZ_NVP_DBA, /* aad icv */ | 42 | NWZ_NVP_DBA, /* aad icv */ |
43 | NWZ_NVP_DBG, /* */ | 43 | NWZ_NVP_DBG, /* */ |
44 | NWZ_NVP_DBI, /* dead battery image */ | 44 | NWZ_NVP_DBI, /* dead battery image */ |
45 | NWZ_NVP_DBV, /* empr icv | empr key */ | 45 | NWZ_NVP_DBV, /* empr key | empr icv */ |
46 | NWZ_NVP_DCC, /* secure clock */ | 46 | NWZ_NVP_DCC, /* secure clock */ |
47 | NWZ_NVP_DOR, /* key mode (debug/release) */ | 47 | NWZ_NVP_DOR, /* key mode (debug/release) */ |
48 | NWZ_NVP_E00, /* EMPR 0 */ | 48 | NWZ_NVP_E00, /* EMPR 0 */ |
@@ -144,7 +144,7 @@ enum nwz_nvp_node_t | |||
144 | /* Number of models */ | 144 | /* Number of models */ |
145 | #define NWZ_MODEL_COUNT 181 | 145 | #define NWZ_MODEL_COUNT 181 |
146 | /* Number of series */ | 146 | /* Number of series */ |
147 | #define NWZ_SERIES_COUNT 36 | 147 | #define NWZ_SERIES_COUNT 37 |
148 | 148 | ||
149 | /* NVP node info */ | 149 | /* NVP node info */ |
150 | struct nwz_nvp_info_t | 150 | struct nwz_nvp_info_t |
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt index bef49ee044..48e54abf51 100644 --- a/utils/nwztools/database/series.txt +++ b/utils/nwztools/database/series.txt | |||
@@ -30,6 +30,7 @@ nwz-s750,NWZ-S740 Series,0x9000002,0x9000004,0x9000005,0xf000002,0xf000004 | |||
30 | nwz-s760,NWZ-S740 Series,0x12000001,0x12000002,0x12000004,0x12000005,0x12000006,0x12010001,0x12010002,0x12010004,0x12010005,0x12010006 | 30 | nwz-s760,NWZ-S740 Series,0x12000001,0x12000002,0x12000004,0x12000005,0x12000006,0x12010001,0x12010002,0x12010004,0x12010005,0x12010006 |
31 | nwz-s770,NWZ-S770 Series,0x16000001,0x16000002,0x16000004,0x16000005,0x16010001,0x16010002,0x16010004,0x16010005 | 31 | nwz-s770,NWZ-S770 Series,0x16000001,0x16000002,0x16000004,0x16000005,0x16010001,0x16010002,0x16010004,0x16010005 |
32 | nw-s780,NW-S780 Series,0x19000001,0x19000002,0x19000004,0x19000005 | 32 | nw-s780,NW-S780 Series,0x19000001,0x19000002,0x19000004,0x19000005 |
33 | nw-wm1,NW-WM1 Series, | ||
33 | nwz-x1000,NWZ-X1000 Series,0x5000002,0x5000004,0x5000005,0x5020002,0x5040002,0x5020004,0x5040004,0x5020005,0x5040005 | 34 | nwz-x1000,NWZ-X1000 Series,0x5000002,0x5000004,0x5000005,0x5020002,0x5040002,0x5020004,0x5040004,0x5020005,0x5040005 |
34 | nw-zx100,NW-ZX100 Series,0x1c000007,0x1c000001,0x1c000002,0x1c000004,0x1c000005,0x1c000006 | 35 | nw-zx100,NW-ZX100 Series,0x1c000007,0x1c000001,0x1c000002,0x1c000004,0x1c000005,0x1c000006 |
35 | nwz-zx2,NW-ZX2, | 36 | nwz-zx2,NW-ZX2, |