len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

nwztools: fix MW-WM1/A30 KAS, fix KAS length

Browse source 
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
This commit is contained in:
Amaury Pouly 2020-06-13 16:15:34 +02:00
parent c8fa53050d
commit 76fbb33adf
7 changed files with 104 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
firmware/target/hosted/sonynwz/nwz-db.c
View file

@ -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 },

2
firmware/target/hosted/sonynwz/nwz-db.h
View file

@ -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