add jim_handler to command_registration

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

diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 76b646777346201fed21c94659eb7c9ec9eba5d6..7edffac9e222523944bb497e1c17bcbccfc3da5e 100644 (file)
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -613,12 +613,12 @@ COMMAND_HANDLER(str7x_handle_disable_jtag_command)
 
        if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "str7x disable_jtag <bank>");
+               command_print(CMD_CTX, "str7x disable_jtag <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;
 
@@ -672,21 +672,28 @@ COMMAND_HANDLER(str7x_handle_disable_jtag_command)
        return ERROR_OK;
 }
 
-static int str7x_register_commands(struct command_context *cmd_ctx)
-{
-       struct command *str7x_cmd = register_command(cmd_ctx, NULL, "str7x",
-                       NULL, COMMAND_ANY, "str7x flash specific commands");
-
-       register_command(cmd_ctx, str7x_cmd, "disable_jtag",
-                       str7x_handle_disable_jtag_command, COMMAND_EXEC,
-                       "disable jtag access");
-
-       return ERROR_OK;
-}
+static const struct command_registration str7x_exec_command_handlers[] = {
+       {
+               .name = "disable_jtag",
+               .handler = &str7x_handle_disable_jtag_command,
+               .mode = COMMAND_EXEC,
+               .help = "disable jtag access",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration str7x_command_handlers[] = {
+       {
+               .name = "str7x",
+               .mode = COMMAND_ANY,
+               .help = "str7x flash command group",
+               .chain = str7x_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
 struct flash_driver str7x_flash = {
                .name = "str7x",
-               .register_commands = &str7x_register_commands,
+               .commands = str7x_command_handlers,
                .flash_bank_command = &str7x_flash_bank_command,
                .erase = &str7x_erase,
                .protect = &str7x_protect,