diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2017-10-24 11:45:51 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2017-10-24 11:46:19 +0100 |
commit | 2ae792c2f58d03cfacdf52d179ea571eff795ce3 (patch) | |
tree | 3805fe657e3280bd68adc3d50e7e796eaa3a7491 | |
parent | a644489ccf8a6665274e1666011e9e137cc8ad19 (diff) | |
download | rockbox-2ae792c2f58d03cfacdf52d179ea571eff795ce3.tar.gz rockbox-2ae792c2f58d03cfacdf52d179ea571eff795ce3.zip |
nwztools: add NW-ZX300A
Change-Id: I8b311ed6b48b92b9ecf4fb25c19119cfb2d5beb1
-rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.c | 5 | ||||
-rw-r--r-- | firmware/target/hosted/sonynwz/nwz-db.h | 2 | ||||
-rw-r--r-- | utils/nwztools/database/models.txt | 1 | ||||
-rw-r--r-- | utils/nwztools/database/series.txt | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/firmware/target/hosted/sonynwz/nwz-db.c b/firmware/target/hosted/sonynwz/nwz-db.c index 88872ffae7..d8eda057be 100644 --- a/firmware/target/hosted/sonynwz/nwz-db.c +++ b/firmware/target/hosted/sonynwz/nwz-db.c | |||
@@ -210,6 +210,7 @@ struct nwz_model_info_t nwz_model[NWZ_MODEL_COUNT] = | |||
210 | { 0x22000004, "NW-A35" }, | 210 | { 0x22000004, "NW-A35" }, |
211 | { 0x22000005, "NW-A36" }, | 211 | { 0x22000005, "NW-A36" }, |
212 | { 0x22000006, "NW-A37" }, | 212 | { 0x22000006, "NW-A37" }, |
213 | { 0x23000004, "NW-ZX300A" }, | ||
213 | { 0x23000006, "NW-ZX300" }, | 214 | { 0x23000006, "NW-ZX300" }, |
214 | { 0x24000006, "NW-A47" }, | 215 | { 0x24000006, "NW-A47" }, |
215 | }; | 216 | }; |
@@ -1439,7 +1440,7 @@ static unsigned long models_nwz_x1000[] = { 0x5000002, 0x5000004, 0x5000005, | |||
1439 | static unsigned long models_nw_zx100[] = { 0x1c000007, 0x1c000001, 0x1c000002, | 1440 | static unsigned long models_nw_zx100[] = { 0x1c000007, 0x1c000001, 0x1c000002, |
1440 | 0x1c000004, 0x1c000005, 0x1c000006 }; | 1441 | 0x1c000004, 0x1c000005, 0x1c000006 }; |
1441 | 1442 | ||
1442 | static unsigned long models_nw_zx300[] = { 0x23000006 }; | 1443 | static unsigned long models_nw_zx300[] = { 0x23000004, 0x23000006 }; |
1443 | 1444 | ||
1444 | static unsigned long models_nwz_noname[] = { 0x5010002, 0x5010004, 0x5010005 }; | 1445 | static unsigned long models_nwz_noname[] = { 0x5010002, 0x5010004, 0x5010005 }; |
1445 | 1446 | ||
@@ -1481,6 +1482,6 @@ struct nwz_series_info_t nwz_series[NWZ_SERIES_COUNT] = | |||
1481 | { "nw-wm1", "NW-WM1 Series", 2, models_nw_wm1, &nvp_index_398250 }, | 1482 | { "nw-wm1", "NW-WM1 Series", 2, models_nw_wm1, &nvp_index_398250 }, |
1482 | { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, &nvp_index_4edba7 }, | 1483 | { "nwz-x1000", "NWZ-X1000 Series", 9, models_nwz_x1000, &nvp_index_4edba7 }, |
1483 | { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, &nvp_index_92faee }, | 1484 | { "nw-zx100", "NW-ZX100 Series", 6, models_nw_zx100, &nvp_index_92faee }, |
1484 | { "nw-zx300", "NW-ZX300 Series", 1, models_nw_zx300, &nvp_index_139d65 }, | 1485 | { "nw-zx300", "NW-ZX300 Series", 2, models_nw_zx300, &nvp_index_139d65 }, |
1485 | { "nwz-noname", "NONAME", 3, models_nwz_noname, 0 }, | 1486 | { "nwz-noname", "NONAME", 3, models_nwz_noname, 0 }, |
1486 | }; | 1487 | }; |
diff --git a/firmware/target/hosted/sonynwz/nwz-db.h b/firmware/target/hosted/sonynwz/nwz-db.h index f2efb88847..2b59cb2d47 100644 --- a/firmware/target/hosted/sonynwz/nwz-db.h +++ b/firmware/target/hosted/sonynwz/nwz-db.h | |||
@@ -152,7 +152,7 @@ enum nwz_nvp_node_t | |||
152 | /* Invalid NVP index */ | 152 | /* Invalid NVP index */ |
153 | #define NWZ_NVP_INVALID -1 /* Non-existent entry */ | 153 | #define NWZ_NVP_INVALID -1 /* Non-existent entry */ |
154 | /* Number of models */ | 154 | /* Number of models */ |
155 | #define NWZ_MODEL_COUNT 188 | 155 | #define NWZ_MODEL_COUNT 189 |
156 | /* Number of series */ | 156 | /* Number of series */ |
157 | #define NWZ_SERIES_COUNT 38 | 157 | #define NWZ_SERIES_COUNT 38 |
158 | 158 | ||
diff --git a/utils/nwztools/database/models.txt b/utils/nwztools/database/models.txt index c7329e8b59..7576ae5569 100644 --- a/utils/nwztools/database/models.txt +++ b/utils/nwztools/database/models.txt | |||
@@ -184,5 +184,6 @@ | |||
184 | 0x22000004,NW-A35 | 184 | 0x22000004,NW-A35 |
185 | 0x22000005,NW-A36 | 185 | 0x22000005,NW-A36 |
186 | 0x22000006,NW-A37 | 186 | 0x22000006,NW-A37 |
187 | 0x23000004,NW-ZX300A | ||
187 | 0x23000006,NW-ZX300 | 188 | 0x23000006,NW-ZX300 |
188 | 0x24000006,NW-A47 | 189 | 0x24000006,NW-A47 |
diff --git a/utils/nwztools/database/series.txt b/utils/nwztools/database/series.txt index 2431a56ab1..0f51e5867f 100644 --- a/utils/nwztools/database/series.txt +++ b/utils/nwztools/database/series.txt | |||
@@ -34,5 +34,5 @@ nw-s780,NW-S780 Series,0x19000001,0x19000002,0x19000004,0x19000005 | |||
34 | nw-wm1,NW-WM1 Series,0x20000007,0x21000008 | 34 | nw-wm1,NW-WM1 Series,0x20000007,0x21000008 |
35 | nwz-x1000,NWZ-X1000 Series,0x5000002,0x5000004,0x5000005,0x5020002,0x5040002,0x5020004,0x5040004,0x5020005,0x5040005 | 35 | nwz-x1000,NWZ-X1000 Series,0x5000002,0x5000004,0x5000005,0x5020002,0x5040002,0x5020004,0x5040004,0x5020005,0x5040005 |
36 | nw-zx100,NW-ZX100 Series,0x1c000007,0x1c000001,0x1c000002,0x1c000004,0x1c000005,0x1c000006 | 36 | nw-zx100,NW-ZX100 Series,0x1c000007,0x1c000001,0x1c000002,0x1c000004,0x1c000005,0x1c000006 |
37 | nw-zx300,NW-ZX300 Series,0x23000006 | 37 | nw-zx300,NW-ZX300 Series,0x23000004,0x23000006 |
38 | nwz-noname,NONAME,0x5010002,0x5010004,0x5010005 | 38 | nwz-noname,NONAME,0x5010002,0x5010004,0x5010005 |