interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nand/fileio: change prototype of nand_fileio_start() 

To prepare for handling TCL return values consistently, all calls
to command_print/command_print_sameline should be ready to switch
to CMD as first parameter.

Change prototype of nand_fileio_start() to pass CMD instead of
CMD_CTX.

This change was part of http://openocd.zylin.com/1815 from Paul
Fertser and has been extracted and rebased to simplify the review.

Change-Id: I7993f6aba997a2d2917949563651c8d0c213730d
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5052
Tested-by: jenkins
This commit is contained in:
Paul Fertser 2019-03-31 18:18:01 +02:00 committed by Tomas Vanek
parent ce6340d8ce
commit dae5a32c05
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/nand/fileio.c
View File

@ -54,12 +54,12 @@ void nand_fileio_init(struct nand_fileio_state *state)
state->oob_format = NAND_OOB_NONE; state->oob_format = NAND_OOB_NONE;
} }
int nand_fileio_start(struct command_context *cmd_ctx, int nand_fileio_start(struct command_invocation *cmd,
struct nand_device *nand, const char *filename, int filemode, struct nand_device *nand, const char *filename, int filemode,
struct nand_fileio_state *state) struct nand_fileio_state *state)
{ {
if (state->address % nand->page_size) { if (state->address % nand->page_size) {
command_print(cmd_ctx, "only page-aligned addresses are supported"); command_print(cmd->ctx, "only page-aligned addresses are supported");
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
} }
@ -69,7 +69,7 @@ int nand_fileio_start(struct command_context *cmd_ctx,
int retval = fileio_open(&state->fileio, filename, filemode, FILEIO_BINARY); int retval = fileio_open(&state->fileio, filename, filemode, FILEIO_BINARY);
if (ERROR_OK != retval) { if (ERROR_OK != retval) {
const char *msg = (FILEIO_READ == filemode) ? "read" : "write"; const char *msg = (FILEIO_READ == filemode) ? "read" : "write";
command_print(cmd_ctx, "failed to open '%s' for %s access", command_print(cmd->ctx, "failed to open '%s' for %s access",
filename, msg); filename, msg);
return retval; return retval;
} }
@ -161,7 +161,7 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
} }
} }
retval = nand_fileio_start(CMD_CTX, nand, CMD_ARGV[1], filemode, state); retval = nand_fileio_start(CMD, nand, CMD_ARGV[1], filemode, state);
if (ERROR_OK != retval) if (ERROR_OK != retval)
return retval; return retval;

2
src/flash/nand/fileio.h
View File

@ -41,7 +41,7 @@ struct nand_fileio_state {
}; };
void nand_fileio_init(struct nand_fileio_state *state); void nand_fileio_init(struct nand_fileio_state *state);
int nand_fileio_start(struct command_context *cmd_ctx, int nand_fileio_start(struct command_invocation *cmd,
struct nand_device *nand, const char *filename, int filemode, struct nand_device *nand, const char *filename, int filemode,
struct nand_fileio_state *state); struct nand_fileio_state *state);
int nand_fileio_cleanup(struct nand_fileio_state *state); int nand_fileio_cleanup(struct nand_fileio_state *state);

2
src/flash/nand/tcl.c
View File

@ -294,7 +294,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
dev.address = file.address; dev.address = file.address;
dev.size = file.size; dev.size = file.size;
dev.oob_format = file.oob_format; dev.oob_format = file.oob_format;
retval = nand_fileio_start(CMD_CTX, nand, NULL, FILEIO_NONE, &dev); retval = nand_fileio_start(CMD, nand, NULL, FILEIO_NONE, &dev);
if (ERROR_OK != retval) if (ERROR_OK != retval)
return retval; return retval;