add jim_handler to command_registration

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

diff --git a/src/flash/avrf.c b/src/flash/avrf.c
index 20c619dce964f1dacf7af2491514b417e3592d56..1c484643c06b9dd708b8f50855d64eeeb096acfb 100644 (file)
--- a/src/flash/avrf.c
+++ b/src/flash/avrf.c
@@ -426,7 +426,7 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
        }
 
        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;
 
@@ -449,21 +449,28 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
        return ERROR_OK;
 }
 
-static int avrf_register_commands(struct command_context *cmd_ctx)
-{
-       struct command *avr_cmd = register_command(cmd_ctx, NULL, "avr",
-                       NULL, COMMAND_ANY, "avr flash specific commands");
-
-       register_command(cmd_ctx, avr_cmd, "mass_erase",
-                       avrf_handle_mass_erase_command, COMMAND_EXEC,
-                       "mass erase device");
-
-       return ERROR_OK;
-}
+static const struct command_registration avrf_exec_command_handlers[] = {
+       {
+               .name = "mass_erase",
+               .handler = &avrf_handle_mass_erase_command,
+               .mode = COMMAND_EXEC,
+               .help = "erase entire device",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration avrf_command_handlers[] = {
+       {
+               .name = "avrf",
+               .mode = COMMAND_ANY,
+               .help = "AVR flash command group",
+               .chain = avrf_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
 struct flash_driver avr_flash = {
                .name = "avr",
-               .register_commands = &avrf_register_commands,
+               .commands = avrf_command_handlers,
                .flash_bank_command = &avrf_flash_bank_command,
                .erase = &avrf_erase,
                .protect = &avrf_protect,