X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstr9x.c;h=6d556d9177ff7e3d4c1ed248dfb136828ef45f1d;hp=4c4d8ae7ff11ce5ab0d19087cb632532e42246a2;hb=833e7f5248778bcb31b4db1a1b91160995415203;hpb=e84849f5ed7416c758914bea88a31827259c4f5b

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 4c4d8ae7ff..6d556d9177 100644
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -121,7 +121,7 @@ FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command)
 {
 	struct str9x_flash_bank *str9x_info;
 
-	if (argc < 6)
+	if (CMD_ARGC < 6)
 	{
 		LOG_WARNING("incomplete flash_bank str9x configuration");
 		return ERROR_FLASH_BANK_INVALID;
@@ -636,21 +636,21 @@ COMMAND_HANDLER(str9x_handle_flash_config_command)
 	struct str9x_flash_bank *str9x_info;
 	struct target *target = NULL;
 
-	if (argc < 5)
+	if (CMD_ARGC < 5)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	struct flash_bank *bank;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
 	uint32_t bbsr, nbbsr, bbadr, nbbadr;
-	COMMAND_PARSE_NUMBER(u32, args[1], bbsr);
-	COMMAND_PARSE_NUMBER(u32, args[2], nbbsr);
-	COMMAND_PARSE_NUMBER(u32, args[3], bbadr);
-	COMMAND_PARSE_NUMBER(u32, args[4], nbbadr);
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], bbsr);
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], nbbsr);
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], bbadr);
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[4], nbbadr);
 
 	str9x_info = bank->driver_priv;
 
@@ -678,10 +678,10 @@ COMMAND_HANDLER(str9x_handle_flash_config_command)
 
 static int str9x_register_commands(struct command_context *cmd_ctx)
 {
-	struct command *str9x_cmd = register_command(cmd_ctx, NULL, "str9x",
+	struct command *str9x_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "str9x",
 			NULL, COMMAND_ANY, "str9x flash commands");
 
-	register_command(cmd_ctx, str9x_cmd, "flash_config",
+	COMMAND_REGISTER(cmd_ctx, str9x_cmd, "flash_config",
 			str9x_handle_flash_config_command, COMMAND_EXEC,
 			"configure str9 flash controller");