X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Fstellaris.c;h=2d653eca1cdbc4048e34d892b15fbefde25f08c2;hb=833e7f5248778bcb31b4db1a1b91160995415203;hp=bbe4aef92b308401d9d2edd2492590a3657aa18a;hpb=e84849f5ed7416c758914bea88a31827259c4f5b;p=openocd.git

diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index bbe4aef92b..2d653eca1c 100644
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -218,7 +218,7 @@ FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command)
 {
 	struct stellaris_flash_bank *stellaris_info;
 
-	if (argc < 6)
+	if (CMD_ARGC < 6)
 	{
 		LOG_WARNING("incomplete flash_bank stellaris configuration");
 		return ERROR_FLASH_BANK_INVALID;
@@ -1132,14 +1132,14 @@ COMMAND_HANDLER(stellaris_handle_mass_erase_command)
 {
 	int i;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
-		command_print(cmd_ctx, "stellaris mass_erase <bank>");
+		command_print(CMD_CTX, "stellaris mass_erase <bank>");
 		return ERROR_OK;
 	}
 
 	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;
 
@@ -1151,11 +1151,11 @@ COMMAND_HANDLER(stellaris_handle_mass_erase_command)
 			bank->sectors[i].is_erased = 1;
 		}
 
-		command_print(cmd_ctx, "stellaris mass erase complete");
+		command_print(CMD_CTX, "stellaris mass erase complete");
 	}
 	else
 	{
-		command_print(cmd_ctx, "stellaris mass erase failed");
+		command_print(CMD_CTX, "stellaris mass erase failed");
 	}
 
 	return ERROR_OK;
@@ -1163,10 +1163,10 @@ COMMAND_HANDLER(stellaris_handle_mass_erase_command)
 
 static int stellaris_register_commands(struct command_context *cmd_ctx)
 {
-	struct command *stm32x_cmd = register_command(cmd_ctx, NULL, "stellaris",
+	struct command *stm32x_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "stellaris",
 			NULL, COMMAND_ANY, "stellaris flash specific commands");
 
-	register_command(cmd_ctx, stm32x_cmd, "mass_erase",
+	COMMAND_REGISTER(cmd_ctx, stm32x_cmd, "mass_erase",
 			stellaris_handle_mass_erase_command, COMMAND_EXEC,
 			"mass erase device");
 	return ERROR_OK;