X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fat91sam3.c;h=616c3fe9d771103a70c09d9380652ac05741f6d6;hp=a220279cf4aaac8ec16bbc46439d45c6fcca67ef;hb=30de1bfda4ea0fd4cd01a2055df463767b979ed4;hpb=962267ba1a3b71cf50407bb6a9b3b2d1cb8cdf85

diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index a220279cf4..616c3fe9d7 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -249,14 +249,14 @@ struct sam3_reg_list {
 
 static struct sam3_chip *all_sam3_chips;
 
-static struct sam3_chip *get_current_sam3(struct command_context *cmd_ctx)
+static struct sam3_chip *get_current_sam3(struct command_invocation *cmd)
 {
 	struct target *t;
 	static struct sam3_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;
 	}
 
@@ -264,7 +264,7 @@ static struct sam3_chip *get_current_sam3(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 SAM3 chips exist?");
+		command_print(cmd->ctx, "No SAM3 chips exist?");
 		return NULL;
 	}
 
@@ -273,7 +273,7 @@ static struct sam3_chip *get_current_sam3(struct command_context *cmd_ctx)
 			return p;
 		p = p->next;
 	}
-	command_print(cmd_ctx, "Cannot find SAM3 chip?");
+	command_print(cmd->ctx, "Cannot find SAM3 chip?");
 	return NULL;
 }
 
@@ -3538,7 +3538,7 @@ done:
 COMMAND_HANDLER(sam3_handle_info_command)
 {
 	struct sam3_chip *pChip;
-	pChip = get_current_sam3(CMD_CTX);
+	pChip = get_current_sam3(CMD);
 	if (!pChip)
 		return ERROR_OK;
 
@@ -3598,7 +3598,7 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
 	int r, who;
 	struct sam3_chip *pChip;
 
-	pChip = get_current_sam3(CMD_CTX);
+	pChip = get_current_sam3(CMD);
 	if (!pChip)
 		return ERROR_OK;
 
@@ -3682,7 +3682,7 @@ COMMAND_HANDLER(sam3_handle_slowclk_command)
 {
 	struct sam3_chip *pChip;
 
-	pChip = get_current_sam3(CMD_CTX);
+	pChip = get_current_sam3(CMD);
 	if (!pChip)
 		return ERROR_OK;