diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-06-07 18:06:31 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-07-10 15:22:10 +0100 |
commit | ad8ace53e5284a9b0c07f20ad10440dbc48dd4f7 (patch) | |
tree | 1a7c000ffffe6660640d96db5d3556b7801dcfb5 /bootloader/x1000/utils.c | |
parent | cc017f211a338a68a571226e589ce34e47fc8ad3 (diff) | |
download | rockbox-ad8ace53e5284a9b0c07f20ad10440dbc48dd4f7.tar.gz rockbox-ad8ace53e5284a9b0c07f20ad10440dbc48dd4f7.zip |
x1000: remove 'typedef struct' from NAND driver
Using 'typedef struct' is not in line with the project coding style
and somewhat problematic, so get rid of it here.
Change-Id: Icfe79de72ed82cb7526e9f4e8296ec12084c01ac
Diffstat (limited to 'bootloader/x1000/utils.c')
-rw-r--r-- | bootloader/x1000/utils.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bootloader/x1000/utils.c b/bootloader/x1000/utils.c index 17eb502e1b..46624b0d1d 100644 --- a/bootloader/x1000/utils.c +++ b/bootloader/x1000/utils.c | |||
@@ -146,14 +146,15 @@ int load_uimage_file(const char* filename, | |||
146 | 146 | ||
147 | struct nand_reader_data | 147 | struct nand_reader_data |
148 | { | 148 | { |
149 | nand_drv* ndrv; | 149 | struct nand_drv* ndrv; |
150 | nand_page_t page; | 150 | nand_page_t page; |
151 | nand_page_t end_page; | 151 | nand_page_t end_page; |
152 | unsigned offset; | 152 | unsigned offset; |
153 | uint32_t count; | 153 | uint32_t count; |
154 | }; | 154 | }; |
155 | 155 | ||
156 | static int uimage_nand_reader_init(struct nand_reader_data* d, nand_drv* ndrv, | 156 | static int uimage_nand_reader_init(struct nand_reader_data* d, |
157 | struct nand_drv* ndrv, | ||
157 | uint32_t addr, uint32_t length) | 158 | uint32_t addr, uint32_t length) |
158 | { | 159 | { |
159 | unsigned pg_size = ndrv->chip->page_size; | 160 | unsigned pg_size = ndrv->chip->page_size; |
@@ -177,7 +178,7 @@ static int uimage_nand_reader_init(struct nand_reader_data* d, nand_drv* ndrv, | |||
177 | static ssize_t uimage_nand_reader(void* buf, size_t count, void* rctx) | 178 | static ssize_t uimage_nand_reader(void* buf, size_t count, void* rctx) |
178 | { | 179 | { |
179 | struct nand_reader_data* d = rctx; | 180 | struct nand_reader_data* d = rctx; |
180 | nand_drv* ndrv = d->ndrv; | 181 | struct nand_drv* ndrv = d->ndrv; |
181 | unsigned pg_size = ndrv->chip->page_size; | 182 | unsigned pg_size = ndrv->chip->page_size; |
182 | size_t read_count = 0; | 183 | size_t read_count = 0; |
183 | int rc; | 184 | int rc; |
@@ -223,7 +224,7 @@ static ssize_t uimage_nand_reader(void* buf, size_t count, void* rctx) | |||
223 | int load_uimage_flash(uint32_t addr, uint32_t length, | 224 | int load_uimage_flash(uint32_t addr, uint32_t length, |
224 | struct uimage_header* uh, size_t* sizep) | 225 | struct uimage_header* uh, size_t* sizep) |
225 | { | 226 | { |
226 | nand_drv* ndrv = nand_init(); | 227 | struct nand_drv* ndrv = nand_init(); |
227 | nand_lock(ndrv); | 228 | nand_lock(ndrv); |
228 | if(nand_open(ndrv) != NAND_SUCCESS) { | 229 | if(nand_open(ndrv) != NAND_SUCCESS) { |
229 | splashf(5*HZ, "NAND open failed"); | 230 | splashf(5*HZ, "NAND open failed"); |
@@ -259,7 +260,7 @@ int dump_flash(int fd, uint32_t addr, uint32_t length) | |||
259 | static char buf[8192]; | 260 | static char buf[8192]; |
260 | int ret = 0; | 261 | int ret = 0; |
261 | 262 | ||
262 | nand_drv* ndrv = nand_init(); | 263 | struct nand_drv* ndrv = nand_init(); |
263 | nand_lock(ndrv); | 264 | nand_lock(ndrv); |
264 | 265 | ||
265 | ret = nand_open(ndrv); | 266 | ret = nand_open(ndrv); |