From 1d7b37eda1fe475a76b8c3be1cc21fe3e893ad17 Mon Sep 17 00:00:00 2001
From: Amaury Pouly <amaury.pouly@gmail.com>
Date: Sun, 8 Jan 2017 22:28:00 +0100
Subject: nwztools: add various info about S740, S750, S640, E050

Change-Id: I2cc887ce2824a2d0b9aeb2a89df662c621c28750
---
 utils/nwztools/database/nvp/nw-s640.txt  | 79 ++++++++++++++++++++++++++++++++
 utils/nwztools/database/nvp/nwz-a840.txt | 79 ++++++++++++++++++++++++++++++++
 utils/nwztools/database/nvp/nwz-e050.txt | 79 ++++++++++++++++++++++++++++++++
 utils/nwztools/database/nvp/nwz-s740.txt | 79 ++++++++++++++++++++++++++++++++
 utils/nwztools/database/nvp/nwz-s750.txt | 79 ++++++++++++++++++++++++++++++++
 utils/nwztools/database/nwz_db.c         | 12 ++---
 utils/nwztools/database/series.txt       |  4 +-
 utils/nwztools/upgtools/upg.c            |  1 +
 8 files changed, 404 insertions(+), 8 deletions(-)
 create mode 100644 utils/nwztools/database/nvp/nw-s640.txt
 create mode 100644 utils/nwztools/database/nvp/nwz-a840.txt
 create mode 100644 utils/nwztools/database/nvp/nwz-e050.txt
 create mode 100644 utils/nwztools/database/nvp/nwz-s740.txt
 create mode 100644 utils/nwztools/database/nvp/nwz-s750.txt

diff --git a/utils/nwztools/database/nvp/nw-s640.txt b/utils/nwztools/database/nvp/nw-s640.txt
new file mode 100644
index 0000000000..d5f5a05cc0
--- /dev/null
+++ b/utils/nwztools/database/nvp/nw-s640.txt
@@ -0,0 +1,79 @@
+dbg,000
+bti,001
+hdi,002
+cng,003
+ser,004
+app,005
+eri,006
+dcc,007
+mdl,008
+fup,009
+bok,010
+shp,011
+dba,012
+dbv,013
+tr0,014
+tr1,015
+mid,016
+tst,017
+gty,018
+fui,019
+lbi,020
+dor,021
+edw,022
+ubp,023
+syi,024
+exm,025
+pcd,026
+rnd,028
+ufn,029
+sdp,030
+ncp,031
+kas,032
+rtc,034
+bpr,035
+e00,036
+e01,037
+e02,038
+e03,039
+e04,040
+e05,041
+e06,042
+e07,043
+e08,044
+e09,045
+e10,046
+e11,047
+e12,048
+e13,049
+e14,050
+e15,051
+e16,052
+e17,053
+e18,054
+e19,055
+e20,056
+e21,057
+e22,058
+e23,059
+e24,060
+e25,061
+e26,062
+e27,063
+e28,064
+e29,065
+e30,066
+e31,067
+clv,068
+slp,069
+ipt,070
+pts,075
+skt,076
+mac,077
+apd,078
+blf,079
+hld,080
+skd,081
+fmp,082
+sps,083
+msc,084
diff --git a/utils/nwztools/database/nvp/nwz-a840.txt b/utils/nwztools/database/nvp/nwz-a840.txt
new file mode 100644
index 0000000000..d5f5a05cc0
--- /dev/null
+++ b/utils/nwztools/database/nvp/nwz-a840.txt
@@ -0,0 +1,79 @@
+dbg,000
+bti,001
+hdi,002
+cng,003
+ser,004
+app,005
+eri,006
+dcc,007
+mdl,008
+fup,009
+bok,010
+shp,011
+dba,012
+dbv,013
+tr0,014
+tr1,015
+mid,016
+tst,017
+gty,018
+fui,019
+lbi,020
+dor,021
+edw,022
+ubp,023
+syi,024
+exm,025
+pcd,026
+rnd,028
+ufn,029
+sdp,030
+ncp,031
+kas,032
+rtc,034
+bpr,035
+e00,036
+e01,037
+e02,038
+e03,039
+e04,040
+e05,041
+e06,042
+e07,043
+e08,044
+e09,045
+e10,046
+e11,047
+e12,048
+e13,049
+e14,050
+e15,051
+e16,052
+e17,053
+e18,054
+e19,055
+e20,056
+e21,057
+e22,058
+e23,059
+e24,060
+e25,061
+e26,062
+e27,063
+e28,064
+e29,065
+e30,066
+e31,067
+clv,068
+slp,069
+ipt,070
+pts,075
+skt,076
+mac,077
+apd,078
+blf,079
+hld,080
+skd,081
+fmp,082
+sps,083
+msc,084
diff --git a/utils/nwztools/database/nvp/nwz-e050.txt b/utils/nwztools/database/nvp/nwz-e050.txt
new file mode 100644
index 0000000000..d5f5a05cc0
--- /dev/null
+++ b/utils/nwztools/database/nvp/nwz-e050.txt
@@ -0,0 +1,79 @@
+dbg,000
+bti,001
+hdi,002
+cng,003
+ser,004
+app,005
+eri,006
+dcc,007
+mdl,008
+fup,009
+bok,010
+shp,011
+dba,012
+dbv,013
+tr0,014
+tr1,015
+mid,016
+tst,017
+gty,018
+fui,019
+lbi,020
+dor,021
+edw,022
+ubp,023
+syi,024
+exm,025
+pcd,026
+rnd,028
+ufn,029
+sdp,030
+ncp,031
+kas,032
+rtc,034
+bpr,035
+e00,036
+e01,037
+e02,038
+e03,039
+e04,040
+e05,041
+e06,042
+e07,043
+e08,044
+e09,045
+e10,046
+e11,047
+e12,048
+e13,049
+e14,050
+e15,051
+e16,052
+e17,053
+e18,054
+e19,055
+e20,056
+e21,057
+e22,058
+e23,059
+e24,060
+e25,061
+e26,062
+e27,063
+e28,064
+e29,065
+e30,066
+e31,067
+clv,068
+slp,069
+ipt,070
+pts,075
+skt,076
+mac,077
+apd,078
+blf,079
+hld,080
+skd,081
+fmp,082
+sps,083
+msc,084
diff --git a/utils/nwztools/database/nvp/nwz-s740.txt b/utils/nwztools/database/nvp/nwz-s740.txt
new file mode 100644
index 0000000000..d5f5a05cc0
--- /dev/null
+++ b/utils/nwztools/database/nvp/nwz-s740.txt
@@ -0,0 +1,79 @@
+dbg,000
+bti,001
+hdi,002
+cng,003
+ser,004
+app,005
+eri,006
+dcc,007
+mdl,008
+fup,009
+bok,010
+shp,011
+dba,012
+dbv,013
+tr0,014
+tr1,015
+mid,016
+tst,017
+gty,018
+fui,019
+lbi,020
+dor,021
+edw,022
+ubp,023
+syi,024
+exm,025
+pcd,026
+rnd,028
+ufn,029
+sdp,030
+ncp,031
+kas,032
+rtc,034
+bpr,035
+e00,036
+e01,037
+e02,038
+e03,039
+e04,040
+e05,041
+e06,042
+e07,043
+e08,044
+e09,045
+e10,046
+e11,047
+e12,048
+e13,049
+e14,050
+e15,051
+e16,052
+e17,053
+e18,054
+e19,055
+e20,056
+e21,057
+e22,058
+e23,059
+e24,060
+e25,061
+e26,062
+e27,063
+e28,064
+e29,065
+e30,066
+e31,067
+clv,068
+slp,069
+ipt,070
+pts,075
+skt,076
+mac,077
+apd,078
+blf,079
+hld,080
+skd,081
+fmp,082
+sps,083
+msc,084
diff --git a/utils/nwztools/database/nvp/nwz-s750.txt b/utils/nwztools/database/nvp/nwz-s750.txt
new file mode 100644
index 0000000000..d5f5a05cc0
--- /dev/null
+++ b/utils/nwztools/database/nvp/nwz-s750.txt
@@ -0,0 +1,79 @@
+dbg,000
+bti,001
+hdi,002
+cng,003
+ser,004
+app,005
+eri,006
+dcc,007
+mdl,008
+fup,009
+bok,010
+shp,011
+dba,012
+dbv,013
+tr0,014
+tr1,015
+mid,016
+tst,017
+gty,018
+fui,019
+lbi,020
+dor,021
+edw,022
+ubp,023
+syi,024
+exm,025
+pcd,026
+rnd,028
+ufn,029
+sdp,030
+ncp,031
+kas,032
+rtc,034
+bpr,035
+e00,036
+e01,037
+e02,038
+e03,039
+e04,040
+e05,041
+e06,042
+e07,043
+e08,044
+e09,045
+e10,046
+e11,047
+e12,048
+e13,049
+e14,050
+e15,051
+e16,052
+e17,053
+e18,054
+e19,055
+e20,056
+e21,057
+e22,058
+e23,059
+e24,060
+e25,061
+e26,062
+e27,063
+e28,064
+e29,065
+e30,066
+e31,067
+clv,068
+slp,069
+ipt,070
+pts,075
+skt,076
+mac,077
+apd,078
+blf,079
+hld,080
+skd,081
+fmp,082
+sps,083
+msc,084
diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c
index 1c93739e22..4edbb2e1c2 100644
--- a/utils/nwztools/database/nwz_db.c
+++ b/utils/nwztools/database/nwz_db.c
@@ -1116,11 +1116,11 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
     { "nwz-a720", "NWZ-A720 Series", 6, models_nwz_a720, 0 },
     { "nwz-a810", "NWZ-A810 Series", 3, models_nwz_a810, 0 },
     { "nwz-a820", "NWZ-A820 Series", 6, models_nwz_a820, 0 },
-    { "nwz-a840", "NWZ-A840 Series", 6, models_nwz_a840, 0 },
+    { "nwz-a840", "NWZ-A840 Series", 6, models_nwz_a840, &nvp_index_0ac81d },
     { "nwz-a850", "NWZ-A850 Series", 3, models_nwz_a850, &nvp_index_0ac81d },
     { "nwz-a860", "NWZ-A860 Series", 15, models_nwz_a860, &nvp_index_f505c8 },
     { "nw-a910", "NW-A910 Series", 3, models_nw_a910, 0 },
-    { "nwz-e050", "NWZ-E050 Series", 5, models_nwz_e050, 0 },
+    { "nwz-e050", "NWZ-E050 Series", 5, models_nwz_e050, &nvp_index_0ac81d },
     { "nw-e060", "NW-E060 Series", 5, models_nw_e060, &nvp_index_f505c8 },
     { "nw-e080", "NW-E080 Series", 4, models_nw_e080, &nvp_index_6485c8 },
     { "nwz-e350", "NWZ-E350 Series", 3, models_nwz_e350, &nvp_index_0ac81d },
@@ -1134,12 +1134,12 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
     { "nwz-s510", "NWZ-S510 Series", 2, models_nwz_s510, 0 },
     { "nwz-s610", "NWZ-S610 Series", 5, models_nwz_s610, 0 },
     { "nwz-s630", "NWZ-S630 Series", 6, models_nwz_s630, 0 },
-    { "nw-s640", "NW-S640 Series", 3, models_nw_s640, 0 },
+    { "nw-s640", "NW-S640 Series", 3, models_nw_s640, &nvp_index_0ac81d },
     { "nwz-s710", "NWZ-S710 Series", 6, models_nwz_s710, 0 },
     { "nwz-s730", "NWZ-S730 Series", 6, models_nwz_s730, 0 },
-    { "nwz-s740", "NWZ-S740 Series", 6, models_nwz_s740, 0 },
-    { "nwz-s750", "NWZ-S740 Series", 5, models_nwz_s750, 0 },
-    { "nwz-s760", "NWZ-S740 Series", 10, models_nwz_s760, &nvp_index_f505c8 },
+    { "nwz-s740", "NWZ-S740 Series", 6, models_nwz_s740, &nvp_index_0ac81d },
+    { "nwz-s750", "NWZ-S750 Series", 5, models_nwz_s750, &nvp_index_0ac81d },
+    { "nwz-s760", "NWZ-S760 Series", 10, models_nwz_s760, &nvp_index_f505c8 },
     { "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 },
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index 8c1bdb86ed..bba140323b 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -26,8 +26,8 @@ nw-s640,NW-S640 Series,0x6010002,0x6010004,0x6010005
 nwz-s710,NWZ-S710 Series,0x1010000,0x1010001,0x1010002,0x1040000,0x1040001,0x1040002
 nwz-s730,NWZ-S730 Series,0x4010001,0x4010002,0x4010004,0x4030001,0x4030002,0x4030004
 nwz-s740,NWZ-S740 Series,0x6030002,0x6030004,0x6030005,0x6020002,0x6020004,0x6020005
-nwz-s750,NWZ-S740 Series,0x9000002,0x9000004,0x9000005,0xf000002,0xf000004
-nwz-s760,NWZ-S740 Series,0x12000001,0x12000002,0x12000004,0x12000005,0x12000006,0x12010001,0x12010002,0x12010004,0x12010005,0x12010006
+nwz-s750,NWZ-S750 Series,0x9000002,0x9000004,0x9000005,0xf000002,0xf000004
+nwz-s760,NWZ-S760 Series,0x12000001,0x12000002,0x12000004,0x12000005,0x12000006,0x12010001,0x12010002,0x12010004,0x12010005,0x12010006
 nwz-s770,NWZ-S770 Series,0x16000001,0x16000002,0x16000004,0x16000005,0x16010001,0x16010002,0x16010004,0x16010005
 nw-s780,NW-S780 Series,0x19000001,0x19000002,0x19000004,0x19000005
 nw-wm1,NW-WM1 Series,0x20000007,0x21000008
diff --git a/utils/nwztools/upgtools/upg.c b/utils/nwztools/upgtools/upg.c
index 75d9ec472a..e1333c2e29 100644
--- a/utils/nwztools/upgtools/upg.c
+++ b/utils/nwztools/upgtools/upg.c
@@ -34,6 +34,7 @@ struct nwz_model_t g_model_list[] =
     { "nwz-a850", true, "a2efb9168616c2e84d78291295c1aa5d" },
     { "nwz-e470", true, "e4144baaa2707913f17b5634034262c4" },
     { "nwz-e580", true, "6e25f79812eca7ceed04819d833e80af" },
+    { "nwz-s750", true, "6d4f4d9adec781baf197e6255cedd0f6" },
     /* The following keys were obtained by brute forcing firmware upgrades,
      * someone with a device needs to confirm that they work */
     { "nw-a820", false, "0c9869c268e0eaa6d1ba62daab09cebc" },
-- 
cgit v1.2.3