diff options
| author | Marc Schink <openocd-dev@marcschink.de> | 2015-10-04 17:18:40 +0200 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2016-02-29 21:04:47 +0000 |
| commit | 73b676c2fdedcb913f1c20be7de99ea0a94b11cc (patch) | |
| tree | 1b83325ff1fe0aef54d659c8b83378784347919a /src/flash/nand | |
| parent | 7c957b601f7aeabc537519597057e63f2ae60320 (diff) | |
| download | riscv-openocd-73b676c2fdedcb913f1c20be7de99ea0a94b11cc.zip riscv-openocd-73b676c2fdedcb913f1c20be7de99ea0a94b11cc.tar.gz riscv-openocd-73b676c2fdedcb913f1c20be7de99ea0a94b11cc.tar.bz2 | |
helper/fileio: Remove nested struct
Change-Id: I1a3afbddcf950689da58e0df8850a05f558d7879
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3222
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'src/flash/nand')
| -rw-r--r-- | src/flash/nand/fileio.c | 8 | ||||
| -rw-r--r-- | src/flash/nand/fileio.h | 2 | ||||
| -rw-r--r-- | src/flash/nand/tcl.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/flash/nand/fileio.c b/src/flash/nand/fileio.c index d84ef4f..085e4af 100644 --- a/src/flash/nand/fileio.c +++ b/src/flash/nand/fileio.c @@ -99,7 +99,7 @@ int nand_fileio_start(struct command_context *cmd_ctx, int nand_fileio_cleanup(struct nand_fileio_state *state) { if (state->file_opened) - fileio_close(&state->fileio); + fileio_close(state->fileio); if (state->oob) { free(state->oob); @@ -169,7 +169,7 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state, if (!need_size) { size_t filesize; - retval = fileio_size(&state->fileio, &filesize); + retval = fileio_size(state->fileio, &filesize); if (retval != ERROR_OK) return retval; state->size = filesize; @@ -190,7 +190,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s) size_t one_read; if (NULL != s->page) { - fileio_read(&s->fileio, s->page_size, s->page, &one_read); + fileio_read(s->fileio, s->page_size, s->page, &one_read); if (one_read < s->page_size) memset(s->page + one_read, 0xff, s->page_size - one_read); total_read += one_read; @@ -219,7 +219,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s) ecc += 10; } } else if (NULL != s->oob) { - fileio_read(&s->fileio, s->oob_size, s->oob, &one_read); + fileio_read(s->fileio, s->oob_size, s->oob, &one_read); if (one_read < s->oob_size) memset(s->oob + one_read, 0xff, s->oob_size - one_read); total_read += one_read; diff --git a/src/flash/nand/fileio.h b/src/flash/nand/fileio.h index c92c644..f0483a7 100644 --- a/src/flash/nand/fileio.h +++ b/src/flash/nand/fileio.h @@ -37,7 +37,7 @@ struct nand_fileio_state { const int *eccpos; bool file_opened; - struct fileio fileio; + struct fileio *fileio; struct duration bench; }; diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c index 750c1f0..d238e7a 100644 --- a/src/flash/nand/tcl.c +++ b/src/flash/nand/tcl.c @@ -360,16 +360,16 @@ COMMAND_HANDLER(handle_nand_dump_command) } if (NULL != s.page) - fileio_write(&s.fileio, s.page_size, s.page, &size_written); + fileio_write(s.fileio, s.page_size, s.page, &size_written); if (NULL != s.oob) - fileio_write(&s.fileio, s.oob_size, s.oob, &size_written); + fileio_write(s.fileio, s.oob_size, s.oob, &size_written); s.size -= nand->page_size; s.address += nand->page_size; } - retval = fileio_size(&s.fileio, &filesize); + retval = fileio_size(s.fileio, &filesize); if (retval != ERROR_OK) return retval; |