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

diff --git a/src/flash/nand/fileio.c b/src/flash/nand/fileio.c
index 64c32c0a8a025e3b5568ab52605db861a88a196d..76f6e104a441ccd99887da8f9f5fba2186f68b02 100644 (file)
--- a/src/flash/nand/fileio.c
+++ b/src/flash/nand/fileio.c
@@ -54,12 +54,12 @@ void nand_fileio_init(struct nand_fileio_state *state)
        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_fileio_state *state)
 {
        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;
        }
 
@@ -69,7 +69,7 @@ int nand_fileio_start(struct command_context *cmd_ctx,
                int retval = fileio_open(&state->fileio, filename, filemode, FILEIO_BINARY);
                if (ERROR_OK != retval) {
                        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);
                        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)
                return retval;
 

diff --git a/src/flash/nand/fileio.h b/src/flash/nand/fileio.h
index af6c7666ed59ab9968afe797ce3dfd7c4c2072f7..6a094c2f2c5db948d84420cf90bc87ace08033b8 100644 (file)
--- a/src/flash/nand/fileio.h
+++ b/src/flash/nand/fileio.h
@@ -41,7 +41,7 @@ struct nand_fileio_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_fileio_state *state);
 int nand_fileio_cleanup(struct nand_fileio_state *state);

diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index dee4f6da832c8a3c94fdfbbd054173826dae9909..5e8b46e810be777d776d974b8ea1f7bb3ef2578c 100644 (file)
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -294,7 +294,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
        dev.address = file.address;
        dev.size = file.size;
        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)
                return retval;