From 03dd4b92be7dcd5c8ab06da3810887060e06abd5 Mon Sep 17 00:00:00 2001 From: Igor Skochinsky Date: Mon, 3 Apr 2017 15:13:46 +0200 Subject: nwztools/database: misc improvements * make gen_db.py work on Windows/Python 2 - use hashlib module instead of md5sum, also don't rely on / for file path matching - don't use 'file' for a variable name * fix parse_nvp_header.sh for older kernels pre-emmc kernel sources use a slightly different #define format; adjust regexp to catch it. * add nwz-x1000 series NVP layout (from icx1087_nvp.h) some new tags have no description, alas the driver doesn't have them :/ * minor fixes to nvp/README fixed typos/wording Change-Id: I77d8c2704be2f2316e32aadcfd362df7102360d4 --- docs/CREDITS | 1 + utils/nwztools/database/gen_db.py | 13 +- utils/nwztools/database/nvp/README | 39 ++--- utils/nwztools/database/nvp/nwz-x1000.txt | 82 +++++++++++ utils/nwztools/database/nvp/parse_nvp_header.sh | 7 +- utils/nwztools/database/nvp/parse_nvp_nodes.sh | 5 +- utils/nwztools/database/nwz_db.c | 188 +++++++++++++++++++++++- utils/nwztools/database/nwz_db.h | 9 ++ 8 files changed, 315 insertions(+), 29 deletions(-) create mode 100644 utils/nwztools/database/nvp/nwz-x1000.txt diff --git a/docs/CREDITS b/docs/CREDITS index 63f5a79e50..7f210d0015 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -655,6 +655,7 @@ Thomas White Karl Huber Adam Sampson William Wilgus +Igor Skochinsky The libmad team The wavpack team diff --git a/utils/nwztools/database/gen_db.py b/utils/nwztools/database/gen_db.py index 8b7d1cbaaf..de78d05cab 100755 --- a/utils/nwztools/database/gen_db.py +++ b/utils/nwztools/database/gen_db.py @@ -3,6 +3,7 @@ import glob import os import re import subprocess +import hashlib # parse models.txt g_models = [] @@ -35,14 +36,14 @@ g_hash_nvp = dict() # hash -> nvp g_nvp_hash = dict() # codename -> hash HASH_SIZE=6 map_files = glob.glob('nvp/nw*.txt') -for line in subprocess.run(["md5sum"] + map_files, stdout = subprocess.PIPE).stdout.decode("utf-8").split("\n"): - if len(line.rstrip()) == 0: - continue - hash, file = line.rstrip().split() - codename = re.search('nvp/(.*)\.txt', file).group(1) +for f in map_files: + h = hashlib.md5() + h.update(open(f, "rb").read()) + hash = h.hexdigest() + codename = re.search('(nw.*)\.txt', f).group(1) # sanity check if not (codename in g_series_codename): - print("Warning: file %s does not have a match series in series.txt" % file) + print("Warning: file %s does not have a match series in series.txt" % f) hash = hash[:HASH_SIZE] # only keep one file if not (hash in g_hash_nvp): diff --git a/utils/nwztools/database/nvp/README b/utils/nwztools/database/nvp/README index cb403291c8..5ff18513d7 100644 --- a/utils/nwztools/database/nvp/README +++ b/utils/nwztools/database/nvp/README @@ -1,38 +1,39 @@ The NVP map varies a lot from players to players, it is inconceivable to build it by hand. The approach taken is to extract it from the kernel of each player. Since Sony provides the kernel of all players, it is 'only' a matter of -downloading all of them. A bit of back story on the NVP: it is non-volatile -area of the flash that is divided in regions and then "sectors" (unrelated to -hard drive sectors). Each "sector" stores the data of a "node". The ABI +downloading all of them. A bit of background on the NVP: it is non-volatile +partition of the flash that is divided in regions and then "zones". +Each "zone" stores the data of a "node". The ABI between the NVP driver and the userspace is an index: the userspace gives the -index of a node, and then drives looksup its table to see where it is and what +index of a node, and then drives looks up its table to see where it is and what is its size. The index map changes over time so Sony introduces standard "names" for its entries, those are 3-letters acronym (for example "fup" or "bti" or "shp") -that have a corresponding index. For some reason, the driver also contains a -description of the nodes, in english (so "bti" stands for "boot image"). +that have a corresponding index. Sometimes the driver also contains a +description of the nodes, in English (e.g. "bti" stands for "boot image"). parse_nvp_header.sh =================== -This script is given a file name, a kernel directory or a kernel tgz and it will +This script takes a header filename, a kernel directory or a kernel tgz and will try to extract the mapping automatically. It produces a list of pairs , where is the index of the node (that's the only thing that is usable on -a running device) and is the standard name of the node. Note that is -some kind of acronym (like 'fup') and the description needs to be generated -separatly (see other section). +a running device) and is the standard name of the node. The output should +be written to .txt +Note that is an acronym (like 'fup') and the description needs to be generated +separately (see nvprool section). parse_all_nvp_headers.sh ======================== -This scripts expects a directory to have the following structure: +This script expects a directory to have the following structure: dir/ nwz-a10/ linux-kernel-*.tgz nwz-e460/ - linxu-kernel-*.tgz + linux-kernel-*.tgz ... -Each sudirectory must the series name (as used in ../series.txt) and the kernel +Each sudirectory must be the series name (as used in ../series.txt) and the kernel must be a tgz (end in .tgz and not .tar.gz) of the form linux-kernel-*.tgz. Usually the variable bit will be the version but some kernels have unknown versions. It will then run parse_nvp_header.sh on each of them and store the result in a @@ -43,24 +44,24 @@ NOTE: the kernel can be symlinks to other files nvptool ======= -The kernel headers do no contain the description of the nvp node names. -This one can be extract from the icx_nvp[_emmc].ko driver on target using complicated -elf parsing done by nvptool. Technically nvptoo can find much more information -like the node -> humanname mapping as well and the actual sector on the disk but +The kernel headers do not contain descriptions of the nvp node names. +They can be extracted from the icx_nvp[_emmc].ko driver on target using complicated +elf parsing done by nvptool. Technically nvptool can discover much more information +like the node -> human name mapping as well and the actual zone in the flash but since we can already extract it easily from the headers, we only extract description names from it. parse_all_nvp_nodes.sh ====================== -This scripts expects a directory to have the following structure: +This script expects a directory to have the following structure: dir/ nwz-a10/ rootfs.tgz nwz-e460/ rootfs.tgz ... -Each sudirectory must the series name (as used in ../series.txt) and the rootfs +Each sudirectory must be the series name (as used in ../series.txt) and the rootfs must be a tar. It will then extract the relevant icx_nvp driver from it and run nvptool on it to produce a file called nodes-.txt diff --git a/utils/nwztools/database/nvp/nwz-x1000.txt b/utils/nwztools/database/nvp/nwz-x1000.txt new file mode 100644 index 0000000000..ab0f7fb872 --- /dev/null +++ b/utils/nwztools/database/nvp/nwz-x1000.txt @@ -0,0 +1,82 @@ +app,0 +bti,1 +hdi,2 +cng,3 +ser,4 +dg0,5 +dg1,6 +dcc,7 +mdl,8 +fup,9 +bok,10 +shp,11 +dba,12 +dbv,13 +tr0,14 +tr1,15 +mid,16 +tst,17 +gty,18 +fui,19 +lbi,20 +dor,21 +edw,22 +ubp,23 +syi,24 +var,25 +pcd,26 +dbs,27 +rnd,28 +ufn,29 +sdp,30 +ncp,31 +kas,32 +pnc,33 +rtc,34 +bpr,35 +e00,36 +e01,37 +e02,38 +e03,39 +e04,40 +e05,41 +e06,42 +e07,43 +e08,44 +e09,45 +e10,46 +e11,47 +e12,48 +e13,49 +e14,50 +e15,51 +e16,52 +e17,53 +e18,54 +e19,55 +e20,56 +e21,57 +e22,58 +e23,59 +e24,60 +e25,61 +e26,62 +e27,63 +e28,64 +e29,65 +e30,66 +e31,67 +clv,68 +slp,69 +ipt,70 +ep0,71 +ep1,72 +ep2,73 +ep3,74 +pts,75 +skt,76 +mac,77 +apd,78 +blf,79 +hld,80 +skd,81 diff --git a/utils/nwztools/database/nvp/parse_nvp_header.sh b/utils/nwztools/database/nvp/parse_nvp_header.sh index 8baab3c9eb..ee2be93516 100755 --- a/utils/nwztools/database/nvp/parse_nvp_header.sh +++ b/utils/nwztools/database/nvp/parse_nvp_header.sh @@ -66,13 +66,16 @@ else >&2 echo "Analyzing $FILE" fi +# old format: #define ICX1087_NVP_NODE_APP "/dev/icx1087_nvp/0" +# new format: #define ICX_NVP_NODE_APP ICX_NVP_NODE_BASE "0" + cat "$FILE" | awk ' \ BEGIN { \ - expr = "#define[[:space:]]+ICX_NVP_NODE_([[:alnum:]]+)[[:space:]]+ICX_NVP_NODE_BASE[[:space:]]*\"([[:digit:]]+)\""; \ + expr = "#define[[:space:]]+ICX[[:digit:]]*_NVP_NODE_([[:alnum:]]+)[[:space:]]+(ICX_NVP_NODE_BASE[[:space:]]*\"|\"/dev.*_nvp/)([[:digit:]]+)\""; } \ { \ if($0 ~ expr) \ { \ - print(tolower(gensub(expr, "\\1,\\2", "g", $0))); + print(tolower(gensub(expr, "\\1,\\3", "g", $0))); } \ }' diff --git a/utils/nwztools/database/nvp/parse_nvp_nodes.sh b/utils/nwztools/database/nvp/parse_nvp_nodes.sh index 456a707e5d..8fc4367a8f 100755 --- a/utils/nwztools/database/nvp/parse_nvp_nodes.sh +++ b/utils/nwztools/database/nvp/parse_nvp_nodes.sh @@ -4,6 +4,9 @@ # parse_nodes.sh /path/to/rootfs/dir output_file # parse_nodes.sh /path/to/rootfs.tgz output_file # +if [ -z "$NVP_LOG" ]; then + NVP_LOG=/dev/null +fi if [ "$#" -lt 2 ]; then >&2 echo "usage: parse_header.sh /path/to/icx_nvp.ko|/path/to/rootfs/dir|/path/to/rootfs.tgz output_file" exit 1 @@ -56,4 +59,4 @@ else >&2 echo "Analyzing $FILE" fi -./nvptool -x "$FILE" -o "$OUTPUT" >/dev/null +./nvptool -x "$FILE" -o "$OUTPUT" >"$NVP_LOG" diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c index d5c226203b..e77b86e729 100644 --- a/utils/nwztools/database/nwz_db.c +++ b/utils/nwztools/database/nwz_db.c @@ -228,8 +228,11 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] = [NWZ_NVP_DBA] = 12, [NWZ_NVP_DBG] = 0, [NWZ_NVP_DBI] = NWZ_NVP_INVALID, + [NWZ_NVP_DBS] = NWZ_NVP_INVALID, [NWZ_NVP_DBV] = 13, [NWZ_NVP_DCC] = 7, + [NWZ_NVP_DG0] = NWZ_NVP_INVALID, + [NWZ_NVP_DG1] = NWZ_NVP_INVALID, [NWZ_NVP_DOR] = 21, [NWZ_NVP_E00] = 36, [NWZ_NVP_E01] = 37, @@ -264,6 +267,10 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] = [NWZ_NVP_E30] = 66, [NWZ_NVP_E31] = 67, [NWZ_NVP_EDW] = 22, + [NWZ_NVP_EP0] = NWZ_NVP_INVALID, + [NWZ_NVP_EP1] = NWZ_NVP_INVALID, + [NWZ_NVP_EP2] = NWZ_NVP_INVALID, + [NWZ_NVP_EP3] = NWZ_NVP_INVALID, [NWZ_NVP_ERI] = 6, [NWZ_NVP_EXM] = 25, [NWZ_NVP_FMP] = 82, @@ -295,6 +302,7 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] = [NWZ_NVP_NVR] = NWZ_NVP_INVALID, [NWZ_NVP_PCD] = 26, [NWZ_NVP_PCI] = NWZ_NVP_INVALID, + [NWZ_NVP_PNC] = NWZ_NVP_INVALID, [NWZ_NVP_PRK] = NWZ_NVP_INVALID, [NWZ_NVP_PSK] = NWZ_NVP_INVALID, [NWZ_NVP_PTS] = 75, @@ -321,6 +329,7 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] = [NWZ_NVP_UFN] = 29, [NWZ_NVP_UMS] = NWZ_NVP_INVALID, [NWZ_NVP_UPS] = NWZ_NVP_INVALID, + [NWZ_NVP_VAR] = NWZ_NVP_INVALID, [NWZ_NVP_VRT] = NWZ_NVP_INVALID, }; @@ -342,8 +351,11 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] = [NWZ_NVP_DBA] = 24, [NWZ_NVP_DBG] = 0, [NWZ_NVP_DBI] = NWZ_NVP_INVALID, + [NWZ_NVP_DBS] = NWZ_NVP_INVALID, [NWZ_NVP_DBV] = 25, [NWZ_NVP_DCC] = 31, + [NWZ_NVP_DG0] = NWZ_NVP_INVALID, + [NWZ_NVP_DG1] = NWZ_NVP_INVALID, [NWZ_NVP_DOR] = 26, [NWZ_NVP_E00] = 36, [NWZ_NVP_E01] = 37, @@ -378,6 +390,10 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] = [NWZ_NVP_E30] = 66, [NWZ_NVP_E31] = 67, [NWZ_NVP_EDW] = 71, + [NWZ_NVP_EP0] = NWZ_NVP_INVALID, + [NWZ_NVP_EP1] = NWZ_NVP_INVALID, + [NWZ_NVP_EP2] = NWZ_NVP_INVALID, + [NWZ_NVP_EP3] = NWZ_NVP_INVALID, [NWZ_NVP_ERI] = 76, [NWZ_NVP_EXM] = NWZ_NVP_INVALID, [NWZ_NVP_FMP] = 15, @@ -409,6 +425,7 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] = [NWZ_NVP_NVR] = NWZ_NVP_INVALID, [NWZ_NVP_PCD] = 8, [NWZ_NVP_PCI] = NWZ_NVP_INVALID, + [NWZ_NVP_PNC] = NWZ_NVP_INVALID, [NWZ_NVP_PRK] = NWZ_NVP_INVALID, [NWZ_NVP_PSK] = 18, [NWZ_NVP_PTS] = 77, @@ -435,6 +452,7 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] = [NWZ_NVP_UFN] = 10, [NWZ_NVP_UMS] = NWZ_NVP_INVALID, [NWZ_NVP_UPS] = NWZ_NVP_INVALID, + [NWZ_NVP_VAR] = NWZ_NVP_INVALID, [NWZ_NVP_VRT] = 81, }; @@ -456,8 +474,11 @@ static int nvp_index_398250[NWZ_NVP_COUNT] = [NWZ_NVP_DBA] = NWZ_NVP_INVALID, [NWZ_NVP_DBG] = 0, [NWZ_NVP_DBI] = 88, + [NWZ_NVP_DBS] = NWZ_NVP_INVALID, [NWZ_NVP_DBV] = 25, [NWZ_NVP_DCC] = NWZ_NVP_INVALID, + [NWZ_NVP_DG0] = NWZ_NVP_INVALID, + [NWZ_NVP_DG1] = NWZ_NVP_INVALID, [NWZ_NVP_DOR] = NWZ_NVP_INVALID, [NWZ_NVP_E00] = 36, [NWZ_NVP_E01] = 37, @@ -492,6 +513,10 @@ static int nvp_index_398250[NWZ_NVP_COUNT] = [NWZ_NVP_E30] = 66, [NWZ_NVP_E31] = 67, [NWZ_NVP_EDW] = 71, + [NWZ_NVP_EP0] = NWZ_NVP_INVALID, + [NWZ_NVP_EP1] = NWZ_NVP_INVALID, + [NWZ_NVP_EP2] = NWZ_NVP_INVALID, + [NWZ_NVP_EP3] = NWZ_NVP_INVALID, [NWZ_NVP_ERI] = 76, [NWZ_NVP_EXM] = NWZ_NVP_INVALID, [NWZ_NVP_FMP] = 15, @@ -523,6 +548,7 @@ static int nvp_index_398250[NWZ_NVP_COUNT] = [NWZ_NVP_NVR] = 77, [NWZ_NVP_PCD] = 8, [NWZ_NVP_PCI] = 87, + [NWZ_NVP_PNC] = NWZ_NVP_INVALID, [NWZ_NVP_PRK] = 4, [NWZ_NVP_PSK] = 18, [NWZ_NVP_PTS] = NWZ_NVP_INVALID, @@ -549,9 +575,133 @@ static int nvp_index_398250[NWZ_NVP_COUNT] = [NWZ_NVP_UFN] = 10, [NWZ_NVP_UMS] = 27, [NWZ_NVP_UPS] = 29, + [NWZ_NVP_VAR] = NWZ_NVP_INVALID, [NWZ_NVP_VRT] = 81, }; +static int nvp_index_4edba7[NWZ_NVP_COUNT] = +{ + [NWZ_NVP_APD] = 78, + [NWZ_NVP_APP] = 0, + [NWZ_NVP_BFD] = NWZ_NVP_INVALID, + [NWZ_NVP_BFP] = NWZ_NVP_INVALID, + [NWZ_NVP_BLF] = 79, + [NWZ_NVP_BML] = NWZ_NVP_INVALID, + [NWZ_NVP_BOK] = 10, + [NWZ_NVP_BPR] = 35, + [NWZ_NVP_BTC] = NWZ_NVP_INVALID, + [NWZ_NVP_BTI] = 1, + [NWZ_NVP_CLV] = 68, + [NWZ_NVP_CNG] = 3, + [NWZ_NVP_CTR] = NWZ_NVP_INVALID, + [NWZ_NVP_DBA] = 12, + [NWZ_NVP_DBG] = NWZ_NVP_INVALID, + [NWZ_NVP_DBI] = NWZ_NVP_INVALID, + [NWZ_NVP_DBS] = 27, + [NWZ_NVP_DBV] = 13, + [NWZ_NVP_DCC] = 7, + [NWZ_NVP_DG0] = 5, + [NWZ_NVP_DG1] = 6, + [NWZ_NVP_DOR] = 21, + [NWZ_NVP_E00] = 36, + [NWZ_NVP_E01] = 37, + [NWZ_NVP_E02] = 38, + [NWZ_NVP_E03] = 39, + [NWZ_NVP_E04] = 40, + [NWZ_NVP_E05] = 41, + [NWZ_NVP_E06] = 42, + [NWZ_NVP_E07] = 43, + [NWZ_NVP_E08] = 44, + [NWZ_NVP_E09] = 45, + [NWZ_NVP_E10] = 46, + [NWZ_NVP_E11] = 47, + [NWZ_NVP_E12] = 48, + [NWZ_NVP_E13] = 49, + [NWZ_NVP_E14] = 50, + [NWZ_NVP_E15] = 51, + [NWZ_NVP_E16] = 52, + [NWZ_NVP_E17] = 53, + [NWZ_NVP_E18] = 54, + [NWZ_NVP_E19] = 55, + [NWZ_NVP_E20] = 56, + [NWZ_NVP_E21] = 57, + [NWZ_NVP_E22] = 58, + [NWZ_NVP_E23] = 59, + [NWZ_NVP_E24] = 60, + [NWZ_NVP_E25] = 61, + [NWZ_NVP_E26] = 62, + [NWZ_NVP_E27] = 63, + [NWZ_NVP_E28] = 64, + [NWZ_NVP_E29] = 65, + [NWZ_NVP_E30] = 66, + [NWZ_NVP_E31] = 67, + [NWZ_NVP_EDW] = 22, + [NWZ_NVP_EP0] = 71, + [NWZ_NVP_EP1] = 72, + [NWZ_NVP_EP2] = 73, + [NWZ_NVP_EP3] = 74, + [NWZ_NVP_ERI] = NWZ_NVP_INVALID, + [NWZ_NVP_EXM] = NWZ_NVP_INVALID, + [NWZ_NVP_FMP] = NWZ_NVP_INVALID, + [NWZ_NVP_FNI] = NWZ_NVP_INVALID, + [NWZ_NVP_FPI] = NWZ_NVP_INVALID, + [NWZ_NVP_FUI] = 19, + [NWZ_NVP_FUP] = 9, + [NWZ_NVP_FUR] = NWZ_NVP_INVALID, + [NWZ_NVP_FVI] = NWZ_NVP_INVALID, + [NWZ_NVP_GTY] = 18, + [NWZ_NVP_HDI] = 2, + [NWZ_NVP_HLD] = 80, + [NWZ_NVP_INS] = NWZ_NVP_INVALID, + [NWZ_NVP_IPT] = 70, + [NWZ_NVP_KAS] = 32, + [NWZ_NVP_LBI] = 20, + [NWZ_NVP_LYR] = NWZ_NVP_INVALID, + [NWZ_NVP_MAC] = 77, + [NWZ_NVP_MCR] = NWZ_NVP_INVALID, + [NWZ_NVP_MDK] = NWZ_NVP_INVALID, + [NWZ_NVP_MDL] = 8, + [NWZ_NVP_MID] = 16, + [NWZ_NVP_MLK] = NWZ_NVP_INVALID, + [NWZ_NVP_MSC] = NWZ_NVP_INVALID, + [NWZ_NVP_MSO] = NWZ_NVP_INVALID, + [NWZ_NVP_MTM] = NWZ_NVP_INVALID, + [NWZ_NVP_MUK] = NWZ_NVP_INVALID, + [NWZ_NVP_NCP] = 31, + [NWZ_NVP_NVR] = NWZ_NVP_INVALID, + [NWZ_NVP_PCD] = 26, + [NWZ_NVP_PCI] = NWZ_NVP_INVALID, + [NWZ_NVP_PNC] = 33, + [NWZ_NVP_PRK] = NWZ_NVP_INVALID, + [NWZ_NVP_PSK] = NWZ_NVP_INVALID, + [NWZ_NVP_PTS] = 75, + [NWZ_NVP_RBT] = NWZ_NVP_INVALID, + [NWZ_NVP_RND] = 28, + [NWZ_NVP_RTC] = 34, + [NWZ_NVP_SDC] = NWZ_NVP_INVALID, + [NWZ_NVP_SDP] = 30, + [NWZ_NVP_SER] = 4, + [NWZ_NVP_SFI] = NWZ_NVP_INVALID, + [NWZ_NVP_SHE] = NWZ_NVP_INVALID, + [NWZ_NVP_SHP] = 11, + [NWZ_NVP_SID] = NWZ_NVP_INVALID, + [NWZ_NVP_SKD] = 81, + [NWZ_NVP_SKT] = 76, + [NWZ_NVP_SKU] = NWZ_NVP_INVALID, + [NWZ_NVP_SLP] = 69, + [NWZ_NVP_SPS] = NWZ_NVP_INVALID, + [NWZ_NVP_SYI] = 24, + [NWZ_NVP_TR0] = 14, + [NWZ_NVP_TR1] = 15, + [NWZ_NVP_TST] = 17, + [NWZ_NVP_UBP] = 23, + [NWZ_NVP_UFN] = 29, + [NWZ_NVP_UMS] = NWZ_NVP_INVALID, + [NWZ_NVP_UPS] = NWZ_NVP_INVALID, + [NWZ_NVP_VAR] = 25, + [NWZ_NVP_VRT] = NWZ_NVP_INVALID, +}; + static int nvp_index_6485c8[NWZ_NVP_COUNT] = { [NWZ_NVP_APD] = 78, @@ -570,8 +720,11 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] = [NWZ_NVP_DBA] = 24, [NWZ_NVP_DBG] = 0, [NWZ_NVP_DBI] = 88, + [NWZ_NVP_DBS] = NWZ_NVP_INVALID, [NWZ_NVP_DBV] = 25, [NWZ_NVP_DCC] = 31, + [NWZ_NVP_DG0] = NWZ_NVP_INVALID, + [NWZ_NVP_DG1] = NWZ_NVP_INVALID, [NWZ_NVP_DOR] = 26, [NWZ_NVP_E00] = 36, [NWZ_NVP_E01] = 37, @@ -606,6 +759,10 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] = [NWZ_NVP_E30] = 66, [NWZ_NVP_E31] = 67, [NWZ_NVP_EDW] = 71, + [NWZ_NVP_EP0] = NWZ_NVP_INVALID, + [NWZ_NVP_EP1] = NWZ_NVP_INVALID, + [NWZ_NVP_EP2] = NWZ_NVP_INVALID, + [NWZ_NVP_EP3] = NWZ_NVP_INVALID, [NWZ_NVP_ERI] = 76, [NWZ_NVP_EXM] = NWZ_NVP_INVALID, [NWZ_NVP_FMP] = 15, @@ -637,6 +794,7 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] = [NWZ_NVP_NVR] = NWZ_NVP_INVALID, [NWZ_NVP_PCD] = 8, [NWZ_NVP_PCI] = 87, + [NWZ_NVP_PNC] = NWZ_NVP_INVALID, [NWZ_NVP_PRK] = NWZ_NVP_INVALID, [NWZ_NVP_PSK] = 18, [NWZ_NVP_PTS] = 77, @@ -663,6 +821,7 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] = [NWZ_NVP_UFN] = 10, [NWZ_NVP_UMS] = NWZ_NVP_INVALID, [NWZ_NVP_UPS] = NWZ_NVP_INVALID, + [NWZ_NVP_VAR] = NWZ_NVP_INVALID, [NWZ_NVP_VRT] = 81, }; @@ -684,8 +843,11 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] = [NWZ_NVP_DBA] = 24, [NWZ_NVP_DBG] = 0, [NWZ_NVP_DBI] = 88, + [NWZ_NVP_DBS] = NWZ_NVP_INVALID, [NWZ_NVP_DBV] = 25, [NWZ_NVP_DCC] = 31, + [NWZ_NVP_DG0] = NWZ_NVP_INVALID, + [NWZ_NVP_DG1] = NWZ_NVP_INVALID, [NWZ_NVP_DOR] = 26, [NWZ_NVP_E00] = 36, [NWZ_NVP_E01] = 37, @@ -720,6 +882,10 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] = [NWZ_NVP_E30] = 66, [NWZ_NVP_E31] = 67, [NWZ_NVP_EDW] = 71, + [NWZ_NVP_EP0] = NWZ_NVP_INVALID, + [NWZ_NVP_EP1] = NWZ_NVP_INVALID, + [NWZ_NVP_EP2] = NWZ_NVP_INVALID, + [NWZ_NVP_EP3] = NWZ_NVP_INVALID, [NWZ_NVP_ERI] = 76, [NWZ_NVP_EXM] = NWZ_NVP_INVALID, [NWZ_NVP_FMP] = 15, @@ -751,6 +917,7 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] = [NWZ_NVP_NVR] = NWZ_NVP_INVALID, [NWZ_NVP_PCD] = 8, [NWZ_NVP_PCI] = 87, + [NWZ_NVP_PNC] = NWZ_NVP_INVALID, [NWZ_NVP_PRK] = NWZ_NVP_INVALID, [NWZ_NVP_PSK] = 18, [NWZ_NVP_PTS] = 77, @@ -777,6 +944,7 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] = [NWZ_NVP_UFN] = 10, [NWZ_NVP_UMS] = NWZ_NVP_INVALID, [NWZ_NVP_UPS] = NWZ_NVP_INVALID, + [NWZ_NVP_VAR] = NWZ_NVP_INVALID, [NWZ_NVP_VRT] = 81, }; @@ -798,8 +966,11 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] = [NWZ_NVP_DBA] = 12, [NWZ_NVP_DBG] = 0, [NWZ_NVP_DBI] = NWZ_NVP_INVALID, + [NWZ_NVP_DBS] = NWZ_NVP_INVALID, [NWZ_NVP_DBV] = 13, [NWZ_NVP_DCC] = 7, + [NWZ_NVP_DG0] = NWZ_NVP_INVALID, + [NWZ_NVP_DG1] = NWZ_NVP_INVALID, [NWZ_NVP_DOR] = 21, [NWZ_NVP_E00] = 36, [NWZ_NVP_E01] = 37, @@ -834,6 +1005,10 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] = [NWZ_NVP_E30] = 66, [NWZ_NVP_E31] = 67, [NWZ_NVP_EDW] = 22, + [NWZ_NVP_EP0] = NWZ_NVP_INVALID, + [NWZ_NVP_EP1] = NWZ_NVP_INVALID, + [NWZ_NVP_EP2] = NWZ_NVP_INVALID, + [NWZ_NVP_EP3] = NWZ_NVP_INVALID, [NWZ_NVP_ERI] = 6, [NWZ_NVP_EXM] = 25, [NWZ_NVP_FMP] = 82, @@ -865,6 +1040,7 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] = [NWZ_NVP_NVR] = NWZ_NVP_INVALID, [NWZ_NVP_PCD] = 26, [NWZ_NVP_PCI] = NWZ_NVP_INVALID, + [NWZ_NVP_PNC] = NWZ_NVP_INVALID, [NWZ_NVP_PRK] = NWZ_NVP_INVALID, [NWZ_NVP_PSK] = 86, [NWZ_NVP_PTS] = 75, @@ -891,6 +1067,7 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] = [NWZ_NVP_UFN] = 29, [NWZ_NVP_UMS] = NWZ_NVP_INVALID, [NWZ_NVP_UPS] = NWZ_NVP_INVALID, + [NWZ_NVP_VAR] = NWZ_NVP_INVALID, [NWZ_NVP_VRT] = 85, }; @@ -912,8 +1089,11 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] = [NWZ_NVP_DBA] = { "dba", 160, "aad icv" }, [NWZ_NVP_DBG] = { "dbg", 0, "" }, [NWZ_NVP_DBI] = { "dbi", 262144, "dead battery image" }, + [NWZ_NVP_DBS] = { "dbs", 0, "" }, [NWZ_NVP_DBV] = { "dbv", 520, "empr icv | empr key" }, [NWZ_NVP_DCC] = { "dcc", 20, "secure clock" }, + [NWZ_NVP_DG0] = { "dg0", 0, "" }, + [NWZ_NVP_DG1] = { "dg1", 0, "" }, [NWZ_NVP_DOR] = { "dor", 4, "key mode (debug/release)" }, [NWZ_NVP_E00] = { "e00", 1024, "EMPR 0" }, [NWZ_NVP_E01] = { "e01", 1024, "EMPR 1" }, @@ -948,6 +1128,10 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] = [NWZ_NVP_E30] = { "e30", 1024, "EMPR 30" }, [NWZ_NVP_E31] = { "e31", 1024, "EMPR 31" }, [NWZ_NVP_EDW] = { "edw", 4, "quick shutdown flag" }, + [NWZ_NVP_EP0] = { "ep0", 0, "" }, + [NWZ_NVP_EP1] = { "ep1", 0, "" }, + [NWZ_NVP_EP2] = { "ep2", 0, "" }, + [NWZ_NVP_EP3] = { "ep3", 0, "" }, [NWZ_NVP_ERI] = { "eri", 262144, "update error image" }, [NWZ_NVP_EXM] = { "exm", 4, "exception monitor mode" }, [NWZ_NVP_FMP] = { "fmp", 16, "fm parameter" }, @@ -979,6 +1163,7 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] = [NWZ_NVP_NVR] = { "nvr", 0, "" }, [NWZ_NVP_PCD] = { "pcd", 5, "product code" }, [NWZ_NVP_PCI] = { "pci", 262144, "precharge image" }, + [NWZ_NVP_PNC] = { "pnc", 0, "" }, [NWZ_NVP_PRK] = { "prk", 0, "" }, [NWZ_NVP_PSK] = { "psk", 512, "bluetooth pskey" }, [NWZ_NVP_PTS] = { "pts", 4, "wifi protected setup" }, @@ -1005,6 +1190,7 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] = [NWZ_NVP_UFN] = { "ufn", 8, "update file name" }, [NWZ_NVP_UMS] = { "ums", 0, "" }, [NWZ_NVP_UPS] = { "ups", 0, "" }, + [NWZ_NVP_VAR] = { "var", 0, "" }, [NWZ_NVP_VRT] = { "vrt", 4, "europe vol regulation flag" }, }; @@ -1143,7 +1329,7 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = { "nwz-s770", "NWZ-S770 Series", 8, models_nwz_s770, 0 }, { "nw-s780", "NW-S780 Series", 4, models_nw_s780, &nvp_index_6485c8 }, { "nw-wm1", "NW-WM1 Series", 2, models_nw_wm1, &nvp_index_398250 }, - { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, 0 }, + { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, &nvp_index_4edba7 }, { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, &nvp_index_92faee }, { "nwz-noname", "NONAME", 3, models_nwz_noname, 0 }, }; diff --git a/utils/nwztools/database/nwz_db.h b/utils/nwztools/database/nwz_db.h index 23b83c5383..2e05dd0968 100644 --- a/utils/nwztools/database/nwz_db.h +++ b/utils/nwztools/database/nwz_db.h @@ -41,8 +41,11 @@ enum nwz_nvp_node_t NWZ_NVP_DBA, /* aad icv */ NWZ_NVP_DBG, /* */ NWZ_NVP_DBI, /* dead battery image */ + NWZ_NVP_DBS, /* */ NWZ_NVP_DBV, /* empr icv | empr key */ NWZ_NVP_DCC, /* secure clock */ + NWZ_NVP_DG0, /* */ + NWZ_NVP_DG1, /* */ NWZ_NVP_DOR, /* key mode (debug/release) */ NWZ_NVP_E00, /* EMPR 0 */ NWZ_NVP_E01, /* EMPR 1 */ @@ -77,6 +80,10 @@ enum nwz_nvp_node_t NWZ_NVP_E30, /* EMPR 30 */ NWZ_NVP_E31, /* EMPR 31 */ NWZ_NVP_EDW, /* quick shutdown flag */ + NWZ_NVP_EP0, /* */ + NWZ_NVP_EP1, /* */ + NWZ_NVP_EP2, /* */ + NWZ_NVP_EP3, /* */ NWZ_NVP_ERI, /* update error image */ NWZ_NVP_EXM, /* exception monitor mode */ NWZ_NVP_FMP, /* fm parameter */ @@ -108,6 +115,7 @@ enum nwz_nvp_node_t NWZ_NVP_NVR, /* */ NWZ_NVP_PCD, /* product code */ NWZ_NVP_PCI, /* precharge image */ + NWZ_NVP_PNC, /* */ NWZ_NVP_PRK, /* */ NWZ_NVP_PSK, /* bluetooth pskey */ NWZ_NVP_PTS, /* wifi protected setup */ @@ -134,6 +142,7 @@ enum nwz_nvp_node_t NWZ_NVP_UFN, /* update file name */ NWZ_NVP_UMS, /* */ NWZ_NVP_UPS, /* */ + NWZ_NVP_VAR, /* */ NWZ_NVP_VRT, /* europe vol regulation flag */ NWZ_NVP_COUNT /* Number of nvp nodes */ }; -- cgit v1.2.3