add jim_handler to command_registration

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

diff --git a/src/flash/flash.c b/src/flash/flash.c
index de95b62f5b42a25ade70b43c0fd192c9da86bdb3..bbdbaa8dc14e7c5025eb152b4af9e050d380cde5 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -263,15 +263,20 @@ COMMAND_HANDLER(handle_flash_bank_command)
                if (strcmp(driver_name, flash_drivers[i]->name) != 0)
                        continue;
 
-               struct flash_bank *p, *c;
-
                /* register flash specific commands */
-               if (flash_drivers[i]->register_commands(CMD_CTX) != ERROR_OK)
+               if (NULL != flash_drivers[i]->commands)
                {
-                       LOG_ERROR("couldn't register '%s' commands", driver_name);
-                       return ERROR_FAIL;
+                       int retval = register_commands(CMD_CTX, NULL,
+                                       flash_drivers[i]->commands);
+                       if (ERROR_OK != retval)
+                       {
+                               LOG_ERROR("couldn't register '%s' commands",
+                                               driver_name);
+                               return ERROR_FAIL;
+                       }
                }
 
+               struct flash_bank *p, *c;
                c = malloc(sizeof(struct flash_bank));
                c->name = strdup(bank_name);
                c->target = target;
@@ -1363,8 +1368,6 @@ static const struct command_registration flash_exec_command_handlers[] = {
 
 int flash_init_drivers(struct command_context *cmd_ctx)
 {
-       register_jim(cmd_ctx, "ocd_flash_banks",
-                       jim_flash_banks, "return information about the flash banks");
        if (!flash_banks)
                return ERROR_OK;
 
@@ -1372,7 +1375,6 @@ int flash_init_drivers(struct command_context *cmd_ctx)
        return register_commands(cmd_ctx, parent, flash_exec_command_handlers);
 }
 
-
 static const struct command_registration flash_config_command_handlers[] = {
        {
                .name = "bank",
@@ -1384,6 +1386,12 @@ static const struct command_registration flash_config_command_handlers[] = {
                .help = "Define a new bank with the given name, "
                        "using the specified NOR flash driver.",
        },
+       {
+               .name = "banks",
+               .mode = COMMAND_ANY,
+               .jim_handler = &jim_flash_banks,
+               .help = "return information about the flash banks",
+       },
        COMMAND_REGISTRATION_DONE
 };
 static const struct command_registration flash_command_handlers[] = {