diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2020-06-13 16:15:34 +0200 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2020-10-11 13:08:03 +0200 |
| commit | 76fbb33adf3cd0b6bcbe26dc47464904493160bd (patch) | |
| tree | cfabff837f7153496faf41eb3853b9d6ac826a53 /firmware | |
| parent | c8fa53050d30b667f224668ca5de2bb7f07a1b3d (diff) | |
nwztools: fix MW-WM1/A30 KAS, fix KAS length
Split WM1A/WM1Z because they don't have the same KAS. On newer devices, the KAS
is actually 64 bytes, not 60. The strange thing is that "get_dnk_nvp kas" returns
60 bytes whereas "get_dnk_prop kas" returns 64, not sure why.
Change-Id: I944d3d838209ba58388439af0cdf5d7c74f1f7fc
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.c | 7 | ||||
| -rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/firmware/target/hosted/sonynwz/nwz-db.c b/firmware/target/hosted/sonynwz/nwz-db.c index a43ce6c551..12c70ffb39 100644 --- a/firmware/target/hosted/sonynwz/nwz-db.c +++ b/firmware/target/hosted/sonynwz/nwz-db.c @@ -1877,7 +1877,9 @@ static unsigned long models_nwz_s770[] = { 0x16000001, 0x16000002, 0x16000004, static unsigned long models_nw_s780[] = { 0x19000001, 0x19000002, 0x19000004, 0x19000005 }; -static unsigned long models_nw_wm1[] = { 0x20000007, 0x21000008 }; +static unsigned long models_nw_wm1a[] = { 0x20000007 }; + +static unsigned long models_nw_wm1z[] = { 0x21000008 }; static unsigned long models_nwz_x1000[] = { 0x5000002, 0x5000004, 0x5000005, 0x5020002, 0x5040002, 0x5020004, 0x5040004, 0x5020005, 0x5040005 }; @@ -1927,7 +1929,8 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = { "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 }, + { "nw-wm1a", "NW-WM1 Series", 1, models_nw_wm1a, &nvp_index_398250 }, + { "nw-wm1z", "NW-WM1 Series", 1, models_nw_wm1z, &nvp_index_398250 }, { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, &nvp_index_4edba7 }, { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, &nvp_index_92faee }, { "nw-zx300", "NW-ZX300 Series", 3, models_nw_zx300, &nvp_index_139d65 }, diff --git a/firmware/target/hosted/sonynwz/nwz-db.h b/firmware/target/hosted/sonynwz/nwz-db.h index af2908b66f..a98267227b 100644 --- a/firmware/target/hosted/sonynwz/nwz-db.h +++ b/firmware/target/hosted/sonynwz/nwz-db.h @@ -159,7 +159,7 @@ enum nwz_nvp_node_t /* Number of models */ #define NWZ_MODEL_COUNT 197 /* Number of series */ -#define NWZ_SERIES_COUNT 40 +#define NWZ_SERIES_COUNT 41 /* NVP node info */ struct nwz_nvp_info_t |