X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fat91sam3.c;h=195da91a9750aa75091c471ebf9e10d3fa7c16ce;hb=fd654c8a3e3dbd5ab97eb6b3834ee462dd509a66;hp=4459364e75e78d7b495fb4718079817e9937fb8b;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;p=openocd.git

diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c
index 4459364e75..195da91a97 100644
--- a/src/flash/at91sam3.c
+++ b/src/flash/at91sam3.c
@@ -60,10 +60,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
-#include "log.h"
 #include "types.h"
 #include "flash.h"
-#include "target.h"
 #include "membuf.h"
 #include "at91sam3.h"
 #include "time_support.h"
@@ -2269,7 +2267,7 @@ COMMAND_HANDLER(sam3_handle_info_command)
 	unsigned x;
 	int r;
 
-	pChip = get_current_sam3(cmd_ctx);
+	pChip = get_current_sam3(CMD_CTX);
 	if (!pChip) {
 		return ERROR_OK;
 	}
@@ -2280,7 +2278,7 @@ COMMAND_HANDLER(sam3_handle_info_command)
 	if (pChip->details.bank[0].pBank == NULL) {
 		x = 0;
 	need_define:
-		command_print(cmd_ctx,
+		command_print(CMD_CTX,
 					   "Please define bank %d via command: flash bank %s ... ",
 					   x,
 					   at91sam3_flash.name);
@@ -2331,7 +2329,7 @@ COMMAND_HANDLER(sam3_handle_info_command)
 	// print results
 	cp = membuf_strtok(pChip->mbuf, "\n", &vp);
 	while (cp) {
-		command_print(cmd_ctx,"%s", cp);
+		command_print(CMD_CTX,"%s", cp);
 		cp = membuf_strtok(NULL, "\n", &vp);
 	}
 	return ERROR_OK;
@@ -2343,7 +2341,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_CTX);
 	if (!pChip) {
 		return ERROR_OK;
 	}
@@ -2355,7 +2353,7 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
 
 
 	if (pChip->details.bank[0].pBank == NULL) {
-		command_print(cmd_ctx, "Bank0 must be defined first via: flash bank %s ...",
+		command_print(CMD_CTX, "Bank0 must be defined first via: flash bank %s ...",
 					   at91sam3_flash.name);
 		return ERROR_FAIL;
 	}
@@ -2367,9 +2365,9 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
 	}
 
 
-	switch (argc) {
+	switch (CMD_ARGC) {
 	default:
-		command_print(cmd_ctx,"Too many parameters\n");
+		command_print(CMD_CTX,"Too many parameters\n");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 		break;
 	case 0:
@@ -2380,17 +2378,17 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
 		who = -1;
 		break;
 	case 2:
-		if ((0 == strcmp(args[0], "show")) && (0 == strcmp(args[1], "all"))) {
+		if ((0 == strcmp(CMD_ARGV[0], "show")) && (0 == strcmp(CMD_ARGV[1], "all"))) {
 			who = -1;
 		} else {
 			uint32_t v32;
-			COMMAND_PARSE_NUMBER(u32, args[1], v32);
+			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32);
 			who = v32;
 		}
 		break;
 	}
 
-	if (0 == strcmp("show", args[0])) {
+	if (0 == strcmp("show", CMD_ARGV[0])) {
 		if (who == -1) {
 		showall:
 			r = ERROR_OK;
@@ -2399,32 +2397,32 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command)
 				if (r != ERROR_OK) {
 					break;
 				}
-				command_print(cmd_ctx, "sam3-gpnvm%u: %u", x, v);
+				command_print(CMD_CTX, "sam3-gpnvm%u: %u", x, v);
 			}
 			return r;
 		}
 		if ((who >= 0) && (((unsigned)(who)) < pChip->details.n_gpnvms)) {
 			r = FLASHD_GetGPNVM(&(pChip->details.bank[0]), who, &v);
-			command_print(cmd_ctx, "sam3-gpnvm%u: %u", who, v);
+			command_print(CMD_CTX, "sam3-gpnvm%u: %u", who, v);
 			return r;
 		} else {
-			command_print(cmd_ctx, "sam3-gpnvm invalid GPNVM: %u", who);
+			command_print(CMD_CTX, "sam3-gpnvm invalid GPNVM: %u", who);
 			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
 	}
 
 	if (who == -1) {
-		command_print(cmd_ctx, "Missing GPNVM number");
+		command_print(CMD_CTX, "Missing GPNVM number");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	if (0 == strcmp("set", args[0])) {
+	if (0 == strcmp("set", CMD_ARGV[0])) {
 		r = FLASHD_SetGPNVM(&(pChip->details.bank[0]), who);
-	} else if ((0 == strcmp("clr", args[0])) ||
-			   (0 == strcmp("clear", args[0]))) { // quietly accept both
+	} else if ((0 == strcmp("clr", CMD_ARGV[0])) ||
+			   (0 == strcmp("clear", CMD_ARGV[0]))) { // quietly accept both
 		r = FLASHD_ClrGPNVM(&(pChip->details.bank[0]), who);
 	} else {
-		command_print(cmd_ctx, "Unkown command: %s", args[0]);
+		command_print(CMD_CTX, "Unkown command: %s", CMD_ARGV[0]);
 		r = ERROR_COMMAND_SYNTAX_ERROR;
 	}
 	return r;
@@ -2434,13 +2432,13 @@ COMMAND_HANDLER(sam3_handle_slowclk_command)
 {
 	struct sam3_chip *pChip;
 
-	pChip = get_current_sam3(cmd_ctx);
+	pChip = get_current_sam3(CMD_CTX);
 	if (!pChip) {
 		return ERROR_OK;
 	}
 
 
-	switch (argc) {
+	switch (CMD_ARGC) {
 	case 0:
 		// show
 		break;
@@ -2448,10 +2446,10 @@ COMMAND_HANDLER(sam3_handle_slowclk_command)
 	{
 		// set
 		uint32_t v;
-		COMMAND_PARSE_NUMBER(u32, args[0], v);
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], v);
 		if (v > 200000) {
 			// absurd slow clock of 200Khz?
-			command_print(cmd_ctx,"Absurd/illegal slow clock freq: %d\n", (int)(v));
+			command_print(CMD_CTX,"Absurd/illegal slow clock freq: %d\n", (int)(v));
 			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
 		pChip->cfg.slow_freq = v;
@@ -2459,11 +2457,11 @@ COMMAND_HANDLER(sam3_handle_slowclk_command)
 	}
 	default:
 		// error
-		command_print(cmd_ctx,"Too many parameters");
+		command_print(CMD_CTX,"Too many parameters");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 		break;
 	}
-	command_print(cmd_ctx, "Slowclk freq: %d.%03dkhz",
+	command_print(CMD_CTX, "Slowclk freq: %d.%03dkhz",
 				   (int)(pChip->cfg.slow_freq/ 1000),
 				   (int)(pChip->cfg.slow_freq% 1000));
 	return ERROR_OK;
@@ -2474,7 +2472,7 @@ static int sam3_registered;
 static int
 sam3_register_commands(struct command_context *cmd_ctx)
 {
-	command_t *pCmd;
+	struct command *pCmd;
 
 	// only register once
 	if (!sam3_registered) {