nwztools: remove NW-ZX2

It is Android based and despite the fact that Sony wrote an NVP driver for it,
experiments suggest it is unused because it returns ff all the time...

Change-Id: I37750b659e341b21bed5ebaccf60f9f5fe569f64

4 files changed, 1 insertions, 218 deletions

diff --git a/utils/nwztools/database/nvp/nwz-zx2.txt b/utils/nwztools/database/nvp/nwz-zx2.txt
deleted file mode 100644
index ebc6c8d56d..0000000000
--- a/utils/nwztools/database/nvp/nwz-zx2.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-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
-cgp,027
-rnd,028
-ufn,029
-sdp,030
-ncp,031
-kas,032
-sfi,033
-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
-mtm,071
-mcr,072
-mdk,073
-muk,074
-pts,075
-skt,076
-mac,077
-apd,078
-blf,079
-hld,080
-skd,081
-fmp,082
-sps,083
-msc,084
-vrt,085
-psk,086
-bml,087
-bfd,088
-bfp,089
diff --git a/utils/nwztools/database/nwz_db.c b/utils/nwztools/database/nwz_db.c
index 083f41b39b..3532223f19 100644
--- a/utils/nwztools/database/nwz_db.c
+++ b/utils/nwztools/database/nwz_db.c
@@ -221,7 +221,6 @@ static int nvp_index_0ac81d[NWZ_NVP_COUNT] =
     [NWZ_NVP_BPR] = 35,
     [NWZ_NVP_BTC] = NWZ_NVP_INVALID,
     [NWZ_NVP_BTI] = 1,
-    [NWZ_NVP_CGP] = NWZ_NVP_INVALID,
     [NWZ_NVP_CLV] = 68,
     [NWZ_NVP_CNG] = 3,
     [NWZ_NVP_CTR] = NWZ_NVP_INVALID,
@@ -336,7 +335,6 @@ static int nvp_index_28dc2c[NWZ_NVP_COUNT] =
     [NWZ_NVP_BPR] = 19,
     [NWZ_NVP_BTC] = 85,
     [NWZ_NVP_BTI] = 72,
-    [NWZ_NVP_CGP] = NWZ_NVP_INVALID,
     [NWZ_NVP_CLV] = 68,
     [NWZ_NVP_CNG] = 23,
     [NWZ_NVP_CTR] = NWZ_NVP_INVALID,
@@ -451,7 +449,6 @@ static int nvp_index_398250[NWZ_NVP_COUNT] =
     [NWZ_NVP_BPR] = 19,
     [NWZ_NVP_BTC] = 85,
     [NWZ_NVP_BTI] = 72,
-    [NWZ_NVP_CGP] = NWZ_NVP_INVALID,
     [NWZ_NVP_CLV] = 68,
     [NWZ_NVP_CNG] = 23,
     [NWZ_NVP_CTR] = 90,
@@ -566,7 +563,6 @@ static int nvp_index_6485c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_BPR] = 19,
     [NWZ_NVP_BTC] = 85,
     [NWZ_NVP_BTI] = 72,
-    [NWZ_NVP_CGP] = NWZ_NVP_INVALID,
     [NWZ_NVP_CLV] = 68,
     [NWZ_NVP_CNG] = 23,
     [NWZ_NVP_CTR] = NWZ_NVP_INVALID,
@@ -681,7 +677,6 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
     [NWZ_NVP_BPR] = 19,
     [NWZ_NVP_BTC] = 85,
     [NWZ_NVP_BTI] = 72,
-    [NWZ_NVP_CGP] = NWZ_NVP_INVALID,
     [NWZ_NVP_CLV] = 68,
     [NWZ_NVP_CNG] = 23,
     [NWZ_NVP_CTR] = NWZ_NVP_INVALID,
@@ -784,121 +779,6 @@ static int nvp_index_92faee[NWZ_NVP_COUNT] =
     [NWZ_NVP_VRT] = 81,
 };
 
-static int nvp_index_c8fc85[NWZ_NVP_COUNT] =
-{
-    [NWZ_NVP_APD] = 78,
-    [NWZ_NVP_APP] = 5,
-    [NWZ_NVP_BFD] = 88,
-    [NWZ_NVP_BFP] = 89,
-    [NWZ_NVP_BLF] = 79,
-    [NWZ_NVP_BML] = 87,
-    [NWZ_NVP_BOK] = 10,
-    [NWZ_NVP_BPR] = 35,
-    [NWZ_NVP_BTC] = NWZ_NVP_INVALID,
-    [NWZ_NVP_BTI] = 1,
-    [NWZ_NVP_CGP] = 27,
-    [NWZ_NVP_CLV] = 68,
-    [NWZ_NVP_CNG] = 3,
-    [NWZ_NVP_CTR] = NWZ_NVP_INVALID,
-    [NWZ_NVP_DBA] = 12,
-    [NWZ_NVP_DBG] = 0,
-    [NWZ_NVP_DBI] = NWZ_NVP_INVALID,
-    [NWZ_NVP_DBV] = 13,
-    [NWZ_NVP_DCC] = 7,
-    [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_ERI] = 6,
-    [NWZ_NVP_EXM] = 25,
-    [NWZ_NVP_FMP] = 82,
-    [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] = 72,
-    [NWZ_NVP_MDK] = 73,
-    [NWZ_NVP_MDL] = 8,
-    [NWZ_NVP_MID] = 16,
-    [NWZ_NVP_MLK] = NWZ_NVP_INVALID,
-    [NWZ_NVP_MSC] = 84,
-    [NWZ_NVP_MSO] = NWZ_NVP_INVALID,
-    [NWZ_NVP_MTM] = 71,
-    [NWZ_NVP_MUK] = 74,
-    [NWZ_NVP_NCP] = 31,
-    [NWZ_NVP_NVR] = NWZ_NVP_INVALID,
-    [NWZ_NVP_PCD] = 26,
-    [NWZ_NVP_PCI] = NWZ_NVP_INVALID,
-    [NWZ_NVP_PRK] = NWZ_NVP_INVALID,
-    [NWZ_NVP_PSK] = 86,
-    [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] = 33,
-    [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] = 83,
-    [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_VRT] = 85,
-};
-
 static int nvp_index_f505c8[NWZ_NVP_COUNT] =
 {
     [NWZ_NVP_APD] = 78,
@@ -911,7 +791,6 @@ static int nvp_index_f505c8[NWZ_NVP_COUNT] =
     [NWZ_NVP_BPR] = 35,
     [NWZ_NVP_BTC] = 27,
     [NWZ_NVP_BTI] = 1,
-    [NWZ_NVP_CGP] = NWZ_NVP_INVALID,
     [NWZ_NVP_CLV] = 68,
     [NWZ_NVP_CNG] = 3,
     [NWZ_NVP_CTR] = NWZ_NVP_INVALID,
@@ -1026,7 +905,6 @@ struct nwz_nvp_info_t nwz_nvp[NWZ_NVP_COUNT] =
     [NWZ_NVP_BPR] = { "bpr", 2048, "bluetooth address | bluetooth parameter" },
     [NWZ_NVP_BTC] = { "btc", 4, "battery calibration" },
     [NWZ_NVP_BTI] = { "bti", 262144, "boot image" },
-    [NWZ_NVP_CGP] = { "cgp", 0, "" },
     [NWZ_NVP_CLV] = { "clv", 4, "color variation" },
     [NWZ_NVP_CNG] = { "cng", 704, "aad key | aad/empr key" },
     [NWZ_NVP_CTR] = { "ctr", 0, "" },
@@ -1227,8 +1105,6 @@ static unsigned long models_nwz_x1000[] = { 0x5000002, 0x5000004, 0x5000005,
 static unsigned long models_nw_zx100[] = { 0x1c000007, 0x1c000001, 0x1c000002,
     0x1c000004, 0x1c000005, 0x1c000006 };
 
-static unsigned long models_nwz_zx2[] = {  };
-
 static unsigned long models_nwz_noname[] = { 0x5010002, 0x5010004, 0x5010005 };
 
 struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
@@ -1268,6 +1144,5 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] =
     { "nw-wm1", "NW-WM1 Series", 2, models_nw_wm1, &nvp_index_398250 },
     { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, 0 },
     { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, 0 },
-    { "nwz-zx2", "NW-ZX2", 0, models_nwz_zx2, &nvp_index_c8fc85 },
     { "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 6ac5d60414..6fb742ca2a 100644
--- a/utils/nwztools/database/nwz_db.h
+++ b/utils/nwztools/database/nwz_db.h
@@ -35,7 +35,6 @@ enum nwz_nvp_node_t
     NWZ_NVP_BPR, /* bluetooth address | bluetooth parameter */
     NWZ_NVP_BTC, /* battery calibration */
     NWZ_NVP_BTI, /* boot image */
-    NWZ_NVP_CGP, /*  */
     NWZ_NVP_CLV, /* color variation */
     NWZ_NVP_CNG, /* aad key | aad/empr key */
     NWZ_NVP_CTR, /*  */
@@ -144,7 +143,7 @@ enum nwz_nvp_node_t
 /* Number of models */
 #define NWZ_MODEL_COUNT     183
 /* Number of series */
-#define NWZ_SERIES_COUNT    37
+#define NWZ_SERIES_COUNT    36
 
 /* NVP node info */
 struct nwz_nvp_info_t
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt
index 9cbb65d8ed..f33f40311e 100644
--- a/utils/nwztools/database/series.txt
+++ b/utils/nwztools/database/series.txt
@@ -33,5 +33,4 @@ nw-s780,NW-S780 Series,0x19000001,0x19000002,0x19000004,0x19000005
 nw-wm1,NW-WM1 Series,0x20000007,0x21000008
 nwz-x1000,NWZ-X1000 Series,0x5000002,0x5000004,0x5000005,0x5020002,0x5040002,0x5020004,0x5040004,0x5020005,0x5040005
 nw-zx100,NW-ZX100 Series,0x1c000007,0x1c000001,0x1c000002,0x1c000004,0x1c000005,0x1c000006
-nwz-zx2,NW-ZX2,
 nwz-noname,NONAME,0x5010002,0x5010004,0x5010005