nor/at91sam4: change prototype of get_current_sam4() 55/5055/2
authorPaul Fertser <fercerpav@gmail.com>
Mon, 1 Apr 2019 01:50:38 +0000 (03:50 +0200)
committerTomas Vanek <vanekt@fbl.cz>
Tue, 14 May 2019 18:34:07 +0000 (19:34 +0100)
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 get_current_sam4() 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: I8dfa66f3f6be318d6ba89649279b1b4502f375d9
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/5055
Tested-by: jenkins
src/flash/nor/at91sam4.c

index c89c502..719da2b 100644 (file)
@@ -228,14 +228,14 @@ struct sam4_reg_list {
 
 static struct sam4_chip *all_sam4_chips;
 
-static struct sam4_chip *get_current_sam4(struct command_context *cmd_ctx)
+static struct sam4_chip *get_current_sam4(struct command_invocation *cmd)
 {
        struct target *t;
        static struct sam4_chip *p;
 
-       t = get_current_target(cmd_ctx);
+       t = get_current_target(cmd->ctx);
        if (!t) {
-               command_print(cmd_ctx, "No current target?");
+               command_print(cmd->ctx, "No current target?");
                return NULL;
        }
 
@@ -243,7 +243,7 @@ static struct sam4_chip *get_current_sam4(struct command_context *cmd_ctx)
        if (!p) {
                /* this should not happen */
                /* the command is not registered until the chip is created? */
-               command_print(cmd_ctx, "No SAM4 chips exist?");
+               command_print(cmd->ctx, "No SAM4 chips exist?");
                return NULL;
        }
 
@@ -252,7 +252,7 @@ static struct sam4_chip *get_current_sam4(struct command_context *cmd_ctx)
                        return p;
                p = p->next;
        }
-       command_print(cmd_ctx, "Cannot find SAM4 chip?");
+       command_print(cmd->ctx, "Cannot find SAM4 chip?");
        return NULL;
 }
 
@@ -3018,7 +3018,7 @@ done:
 COMMAND_HANDLER(sam4_handle_info_command)
 {
        struct sam4_chip *pChip;
-       pChip = get_current_sam4(CMD_CTX);
+       pChip = get_current_sam4(CMD);
        if (!pChip)
                return ERROR_OK;
 
@@ -3078,7 +3078,7 @@ COMMAND_HANDLER(sam4_handle_gpnvm_command)
        int r, who;
        struct sam4_chip *pChip;
 
-       pChip = get_current_sam4(CMD_CTX);
+       pChip = get_current_sam4(CMD);
        if (!pChip)
                return ERROR_OK;
 
@@ -3163,7 +3163,7 @@ COMMAND_HANDLER(sam4_handle_slowclk_command)
 {
        struct sam4_chip *pChip;
 
-       pChip = get_current_sam4(CMD_CTX);
+       pChip = get_current_sam4(CMD);
        if (!pChip)
                return ERROR_OK;