X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fpic32mx.c;h=95e2c637349c5bfe91d0a27d9bbcaac00db9840b;hp=bb3d69c16bc45654ddb9985e273de0bcdcdf9e7d;hb=7bf1a86e473a12882bf6f71cb4d0d416394b69d4;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34

diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c
index bb3d69c16b..95e2c63734 100644
--- a/src/flash/pic32mx.c
+++ b/src/flash/pic32mx.c
@@ -66,7 +66,7 @@ FLASH_BANK_COMMAND_HANDLER(pic32mx_flash_bank_command)
 {
 	struct pic32mx_flash_bank *pic32mx_info;
 
-	if (argc < 6)
+	if (CMD_ARGC < 6)
 	{
 		LOG_WARNING("incomplete flash_bank pic32mx configuration");
 		return ERROR_FLASH_BANK_INVALID;
@@ -677,14 +677,14 @@ COMMAND_HANDLER(pic32mx_handle_lock_command)
 	struct target *target = NULL;
 	struct pic32mx_flash_bank *pic32mx_info = NULL;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
 		command_print(cmd_ctx, "pic32mx lock <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_by_num, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -723,14 +723,14 @@ COMMAND_HANDLER(pic32mx_handle_unlock_command)
 	struct target *target = NULL;
 	struct pic32mx_flash_bank *pic32mx_info = NULL;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
 		command_print(cmd_ctx, "pic32mx unlock <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_by_num, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -813,14 +813,14 @@ COMMAND_HANDLER(pic32mx_handle_chip_erase_command)
 #if 0
 	int i;
 
-	if (argc != 0)
+	if (CMD_ARGC != 0)
 	{
 		command_print(cmd_ctx, "pic32mx chip_erase");
 		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_by_num, 0, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -848,7 +848,7 @@ COMMAND_HANDLER(pic32mx_handle_pgm_word_command)
 	uint32_t address, value;
 	int status, res;
 
-	if (argc != 3)
+	if (CMD_ARGC != 3)
 	{
 		command_print(cmd_ctx, "pic32mx pgm_word <addr> <value> <bank>");
 		return ERROR_OK;
@@ -858,7 +858,7 @@ COMMAND_HANDLER(pic32mx_handle_pgm_word_command)
 	COMMAND_PARSE_NUMBER(u32, args[1], value);
 
 	struct flash_bank *bank;
-	int retval = flash_command_get_bank_by_num(cmd_ctx, args[2], &bank);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 2, &bank);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -885,7 +885,7 @@ COMMAND_HANDLER(pic32mx_handle_pgm_word_command)
 
 static int pic32mx_register_commands(struct command_context *cmd_ctx)
 {
-	command_t *pic32mx_cmd = register_command(cmd_ctx, NULL, "pic32mx",
+	struct command *pic32mx_cmd = register_command(cmd_ctx, NULL, "pic32mx",
 			NULL, COMMAND_ANY, "pic32mx flash specific commands");
 #if 0
 	register_command(cmd_ctx, pic32mx_cmd, "lock",