use COMMAND_REGISTER macro

[fw/openocd] / src / flash / avrf.c

diff --git a/src/flash/avrf.c b/src/flash/avrf.c
index e41093de380c0a51ef85cc6b2d147a70e1c52a16..692992f4cdede0932182f214417197d9fcf0c2e0 100644 (file)
--- a/src/flash/avrf.c
+++ b/src/flash/avrf.c
@@ -184,7 +184,7 @@ FLASH_BANK_COMMAND_HANDLER(avrf_flash_bank_command)
 {
        struct avrf_flash_bank *avrf_info;
 
-       if (argc < 6)
+       if (CMD_ARGC < 6)
        {
                LOG_WARNING("incomplete flash_bank avr configuration");
                return ERROR_FLASH_BANK_INVALID;
@@ -419,14 +419,14 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
 {
        int i;
 
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "avr mass_erase <bank>");
+               command_print(CMD_CTX, "avr mass_erase <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;
 
@@ -438,11 +438,11 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
                        bank->sectors[i].is_erased = 1;
                }
 
-               command_print(cmd_ctx, "avr mass erase complete");
+               command_print(CMD_CTX, "avr mass erase complete");
        }
        else
        {
-               command_print(cmd_ctx, "avr mass erase failed");
+               command_print(CMD_CTX, "avr mass erase failed");
        }
 
        LOG_DEBUG("%s", __FUNCTION__);
@@ -451,10 +451,10 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
 
 static int avrf_register_commands(struct command_context *cmd_ctx)
 {
-       struct command *avr_cmd = register_command(cmd_ctx, NULL, "avr",
+       struct command *avr_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "avr",
                        NULL, COMMAND_ANY, "avr flash specific commands");
 
-       register_command(cmd_ctx, avr_cmd, "mass_erase",
+       COMMAND_REGISTER(cmd_ctx, avr_cmd, "mass_erase",
                        avrf_handle_mass_erase_command, COMMAND_EXEC,
                        "mass erase device");