flash_command_get_bank_by_num: make COMMAND_HELPER

[openocd.git] / src / flash / pic32mx.c

diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c
index e19ee950552e29e9f4799259733d267cb313c3c2..51c42b59d9cce23dde6759097977de63665ea811 100644 (file)
--- a/src/flash/pic32mx.c
+++ b/src/flash/pic32mx.c
@@ -684,7 +684,7 @@ COMMAND_HANDLER(pic32mx_handle_lock_command)
        }
 
        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;
 
@@ -730,7 +730,7 @@ COMMAND_HANDLER(pic32mx_handle_unlock_command)
        }
 
        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;
 
@@ -820,7 +820,7 @@ COMMAND_HANDLER(pic32mx_handle_chip_erase_command)
        }
 
        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;
 
@@ -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;
 
@@ -883,9 +883,9 @@ COMMAND_HANDLER(pic32mx_handle_pgm_word_command)
        return ERROR_OK;
 }
 
-static int pic32mx_register_commands(struct command_context_s *cmd_ctx)
+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",