diff options
-rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.c | 4 | ||||
-rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.h | 4 | ||||
-rwxr-xr-x | utils/nwztools/database/gen_db.py | 4 | ||||
-rw-r--r-- | utils/nwztools/database/models.txt | 1 | ||||
-rw-r--r-- | utils/nwztools/database/nvp/dmp-z1.txt | 93 | ||||
-rwxr-xr-x | utils/nwztools/database/nvp/parse_all_nvp_headers.sh | 2 | ||||
-rw-r--r-- | utils/nwztools/database/series.txt | 1 |
7 files changed, 104 insertions, 5 deletions
diff --git a/firmware/target/hosted/sonynwz/nwz-db.c b/firmware/target/hosted/sonynwz/nwz-db.c index a8ba2a7b85..ca60bdf795 100644 --- a/firmware/target/hosted/sonynwz/nwz-db.c +++ b/firmware/target/hosted/sonynwz/nwz-db.c | |||
@@ -219,6 +219,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] = | |||
219 | { 0x24000006, "NW-A47" }, | 219 | { 0x24000006, "NW-A47" }, |
220 | { 0x25000004, "NW-A55" }, | 220 | { 0x25000004, "NW-A55" }, |
221 | { 0x25000006, "NW-A57" }, | 221 | { 0x25000006, "NW-A57" }, |
222 | { 0x26000008, "DMP-Z1" }, | ||
222 | }; | 223 | }; |
223 | 224 | ||
224 | static int nvp_index_06a782[NWZ_NVP_COUNT] = | 225 | static int nvp_index_06a782[NWZ_NVP_COUNT] = |
@@ -1887,6 +1888,8 @@ static unsigned long models_nw_zx300[] = { 0x23000004, 0x23000006, 0x23000007 }; | |||
1887 | 1888 | ||
1888 | static unsigned long models_nwz_noname[] = { 0x5010002, 0x5010004, 0x5010005 }; | 1889 | static unsigned long models_nwz_noname[] = { 0x5010002, 0x5010004, 0x5010005 }; |
1889 | 1890 | ||
1891 | static unsigned long models_dmp_z1[] = { 0x26000008 }; | ||
1892 | |||
1890 | struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | 1893 | struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = |
1891 | { | 1894 | { |
1892 | { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee }, | 1895 | { "nwz-a10", "NWZ-A10 Series", 10, models_nwz_a10, &nvp_index_92faee }, |
@@ -1928,4 +1931,5 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | |||
1928 | { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, &nvp_index_92faee }, | 1931 | { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, &nvp_index_92faee }, |
1929 | { "nw-zx300", "NW-ZX300 Series", 3, models_nw_zx300, &nvp_index_139d65 }, | 1932 | { "nw-zx300", "NW-ZX300 Series", 3, models_nw_zx300, &nvp_index_139d65 }, |
1930 | { "nwz-noname", "NONAME", 3, models_nwz_noname, 0 }, | 1933 | { "nwz-noname", "NONAME", 3, models_nwz_noname, 0 }, |
1934 | { "dmp-z1", "DMP-Z1 Series", 1, models_dmp_z1, &nvp_index_94b5fc }, | ||
1931 | }; | 1935 | }; |
diff --git a/firmware/target/hosted/sonynwz/nwz-db.h b/firmware/target/hosted/sonynwz/nwz-db.h index 152a111644..afc251aa63 100644 --- a/firmware/target/hosted/sonynwz/nwz-db.h +++ b/firmware/target/hosted/sonynwz/nwz-db.h | |||
@@ -157,9 +157,9 @@ enum nwz_nvp_node_t | |||
157 | /* Invalid NVP index */ | 157 | /* Invalid NVP index */ |
158 | #define NWZ_NVP_INVALID -1 /* Non-existent entry */ | 158 | #define NWZ_NVP_INVALID -1 /* Non-existent entry */ |
159 | /* Number of models */ | 159 | /* Number of models */ |
160 | #define NWZ_MODEL_COUNT 195 | 160 | #define NWZ_MODEL_COUNT 196 |
161 | /* Number of series */ | 161 | /* Number of series */ |
162 | #define NWZ_SERIES_COUNT 39 | 162 | #define NWZ_SERIES_COUNT 40 |
163 | 163 | ||
164 | /* NVP node info */ | 164 | /* NVP node info */ |
165 | struct nwz_nvp_info_t | 165 | struct nwz_nvp_info_t |
diff --git a/utils/nwztools/database/gen_db.py b/utils/nwztools/database/gen_db.py index 23f4e3f474..9e8bc89102 100755 --- a/utils/nwztools/database/gen_db.py +++ b/utils/nwztools/database/gen_db.py | |||
@@ -46,12 +46,12 @@ with open('series.txt') as fp: | |||
46 | g_hash_nvp = dict() # hash -> nvp | 46 | g_hash_nvp = dict() # hash -> nvp |
47 | g_nvp_hash = dict() # codename -> hash | 47 | g_nvp_hash = dict() # codename -> hash |
48 | HASH_SIZE=6 | 48 | HASH_SIZE=6 |
49 | map_files = glob.glob('nvp/nw*.txt') | 49 | map_files = glob.glob('nvp/nw*.txt') + glob.glob('nvp/dmp*.txt') |
50 | for f in map_files: | 50 | for f in map_files: |
51 | h = hashlib.md5() | 51 | h = hashlib.md5() |
52 | h.update(open(f, "rb").read()) | 52 | h.update(open(f, "rb").read()) |
53 | hash = h.hexdigest() | 53 | hash = h.hexdigest() |
54 | codename = re.search('(nw.*)\.txt', f).group(1) | 54 | codename = re.search('nvp/([^\.]*)\.txt', f).group(1) |
55 | # sanity check | 55 | # sanity check |
56 | if not (codename in g_series_codename): | 56 | if not (codename in g_series_codename): |
57 | print("Warning: file %s does not have a match series in series.txt" % f) | 57 | print("Warning: file %s does not have a match series in series.txt" % f) |
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt index d89f0aa015..e6e214f2dc 100644 --- a/utils/nwztools/database/models.txt +++ b/utils/nwztools/database/models.txt | |||
@@ -193,3 +193,4 @@ | |||
193 | 0x25000004,NW-A55 | 193 | 0x25000004,NW-A55 |
194 | 0x25000006,NW-A57 | 194 | 0x25000006,NW-A57 |
195 | 0x23000007,NW-ZX300 | 195 | 0x23000007,NW-ZX300 |
196 | 0x26000008,DMP-Z1 | ||
diff --git a/utils/nwztools/database/nvp/dmp-z1.txt b/utils/nwztools/database/nvp/dmp-z1.txt new file mode 100644 index 0000000000..46fb2ffedc --- /dev/null +++ b/utils/nwztools/database/nvp/dmp-z1.txt | |||
@@ -0,0 +1,93 @@ | |||
1 | dbg,000 | ||
2 | syi,001 | ||
3 | ubp,002 | ||
4 | fup,003 | ||
5 | prk,004 | ||
6 | hld,005 | ||
7 | pwd,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 | clg,015 | ||
17 | se2,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 | dgs,092 | ||
38 | atf,023 | ||
39 | lyr,024 | ||
40 | dbv,025 | ||
41 | fur,026 | ||
42 | ums,027 | ||
43 | skd,028 | ||
44 | ups,029 | ||
45 | aws,030 | ||
46 | fvi,031 | ||
47 | mac,032 | ||
48 | fpi,033 | ||
49 | ssk,034 | ||
50 | tr1,035 | ||
51 | e00,036 | ||
52 | e01,037 | ||
53 | e02,038 | ||
54 | e03,039 | ||
55 | e04,040 | ||
56 | e05,041 | ||
57 | e06,042 | ||
58 | e07,043 | ||
59 | e08,044 | ||
60 | e09,045 | ||
61 | e10,046 | ||
62 | e11,047 | ||
63 | e12,048 | ||
64 | e13,049 | ||
65 | e14,050 | ||
66 | e15,051 | ||
67 | e16,052 | ||
68 | e17,053 | ||
69 | e18,054 | ||
70 | e19,055 | ||
71 | e20,056 | ||
72 | e21,057 | ||
73 | e22,058 | ||
74 | e23,059 | ||
75 | e24,060 | ||
76 | e25,061 | ||
77 | e26,062 | ||
78 | e27,063 | ||
79 | e28,064 | ||
80 | e29,065 | ||
81 | e30,066 | ||
82 | e31,067 | ||
83 | clv,068 | ||
84 | sps,069 | ||
85 | rbt,070 | ||
86 | edw,071 | ||
87 | bti,072 | ||
88 | hdi,073 | ||
89 | lbi,074 | ||
90 | fui,075 | ||
91 | eri,076 | ||
92 | pci,087 | ||
93 | dbi,088 | ||
diff --git a/utils/nwztools/database/nvp/parse_all_nvp_headers.sh b/utils/nwztools/database/nvp/parse_all_nvp_headers.sh index 2af5e83cdc..d02440c77d 100755 --- a/utils/nwztools/database/nvp/parse_all_nvp_headers.sh +++ b/utils/nwztools/database/nvp/parse_all_nvp_headers.sh | |||
@@ -24,7 +24,7 @@ if [ "$1" = "--new-only" ]; then | |||
24 | fi | 24 | fi |
25 | 25 | ||
26 | # list interesting directories | 26 | # list interesting directories |
27 | for dir in `find "$1" -maxdepth 1 -name "nw-*" -or -name "nwz-*"` | 27 | for dir in `find "$1" -maxdepth 1 -name "nw-*" -or -name "nwz-*" -or -name "dmp-*"` |
28 | do | 28 | do |
29 | # extract codename | 29 | # extract codename |
30 | codename=`basename "$dir"` | 30 | codename=`basename "$dir"` |
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt index 14d267fbfe..d10bfe2988 100644 --- a/utils/nwztools/database/series.txt +++ b/utils/nwztools/database/series.txt | |||
@@ -37,3 +37,4 @@ nwz-x1000,NWZ-X1000 Series,0x5000002,0x5000004,0x5000005,0x5020002,0x5040002,0x5 | |||
37 | nw-zx100,NW-ZX100 Series,0x1c000007,0x1c000001,0x1c000002,0x1c000004,0x1c000005,0x1c000006 | 37 | nw-zx100,NW-ZX100 Series,0x1c000007,0x1c000001,0x1c000002,0x1c000004,0x1c000005,0x1c000006 |
38 | nw-zx300,NW-ZX300 Series,0x23000004,0x23000006,0x23000007 | 38 | nw-zx300,NW-ZX300 Series,0x23000004,0x23000006,0x23000007 |
39 | nwz-noname,NONAME,0x5010002,0x5010004,0x5010005 | 39 | nwz-noname,NONAME,0x5010002,0x5010004,0x5010005 |
40 | dmp-z1,DMP-Z1 Series,0x26000008 | ||