X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstr7x.c;h=b79dd17fde37fcb25c57cd97514a3c597b9c1e63;hb=ff25e76bad7e57da4ebd363f1b35d4af04acaa67;hp=71709bb028572684d79fe06a7e174e207eb7ca3d;hpb=ef746e27c55c14b7a4f6381c490e5c175e409c0b;p=openocd.git

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 71709bb028..b79dd17fde 100644
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -27,6 +27,7 @@
 #include "str7x.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 struct str7x_mem_layout mem_layout_str7bank0[] = {
@@ -113,7 +114,7 @@ FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command)
 {
 	struct str7x_flash_bank *str7x_info;
 
-	if (argc < 7)
+	if (CMD_ARGC < 7)
 	{
 		LOG_WARNING("incomplete flash_bank str7x configuration");
 		return ERROR_FLASH_BANK_INVALID;
@@ -126,23 +127,23 @@ FLASH_BANK_COMMAND_HANDLER(str7x_flash_bank_command)
 	str7x_info->busy_bits = (FLASH_LOCK | FLASH_BSYA1 | FLASH_BSYA0);
 	str7x_info->disable_bit = (1 << 1);
 
-	if (strcmp(args[6], "STR71x") == 0)
+	if (strcmp(CMD_ARGV[6], "STR71x") == 0)
 	{
 		str7x_info->register_base = 0x40100000;
 	}
-	else if (strcmp(args[6], "STR73x") == 0)
+	else if (strcmp(CMD_ARGV[6], "STR73x") == 0)
 	{
 		str7x_info->register_base = 0x80100000;
 		str7x_info->busy_bits = (FLASH_LOCK | FLASH_BSYA0);
 	}
-	else if (strcmp(args[6], "STR75x") == 0)
+	else if (strcmp(CMD_ARGV[6], "STR75x") == 0)
 	{
 		str7x_info->register_base = 0x20100000;
 		str7x_info->disable_bit = (1 << 0);
 	}
 	else
 	{
-		LOG_ERROR("unknown STR7x variant: '%s'", args[6]);
+		LOG_ERROR("unknown STR7x variant: '%s'", CMD_ARGV[6]);
 		free(str7x_info);
 		return ERROR_FLASH_BANK_INVALID;
 	}
@@ -610,14 +611,14 @@ COMMAND_HANDLER(str7x_handle_disable_jtag_command)
 	uint16_t ProtectionLevel = 0;
 	uint16_t ProtectionRegs;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "str7x disable_jtag <bank>");
+		command_print(CMD_CTX, "str7x disable_jtag <bank>");
 		return ERROR_OK;
 	}
 
 	struct flash_bank *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;