Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
change #include "time_support.h" to <helper/time_support.h>
[openocd.git] / src / flash / flash.c
diff --git a/src/flash/flash.c b/src/flash/flash.c
index 7bc74ab73a7edae8124e7607cbda4b55b5afc7a1..e910e42f9bc5e45026589e674f77fb691a4bcdd5 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -30,7 +30,7 @@
 #include "flash.h"
 #include "common.h"
 #include "image.h"
-#include "time_support.h"
+#include <helper/time_support.h>
 
 static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock);
 
@@ -78,7 +78,6 @@ struct flash_driver *flash_drivers[] = {
 };
 
 struct flash_bank *flash_banks;
-static         struct command *flash_cmd;
 
 /* wafer thin wrapper for invoking the flash driver */
 static int flash_driver_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
@@ -264,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;
@@ -555,7 +559,7 @@ static int flash_check_sector_parameters(struct command_context *cmd_ctx,
 
 COMMAND_HANDLER(handle_flash_erase_command)
 {
-       if (CMD_ARGC != 2)
+       if (CMD_ARGC != 3)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        uint32_t bank_nr;
@@ -595,7 +599,7 @@ COMMAND_HANDLER(handle_flash_erase_command)
 
 COMMAND_HANDLER(handle_flash_protect_command)
 {
-       if (CMD_ARGC != 3)
+       if (CMD_ARGC != 4)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        uint32_t bank_nr;
@@ -1272,64 +1276,158 @@ int default_flash_blank_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
+static const struct command_registration flash_exec_command_handlers[] = {
+       {
+               .name = "probe",
+               .handler = &handle_flash_probe_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank>",
+               .help = "identify flash bank",
+       },
+       {
+               .name = "info",
+               .handler = &handle_flash_info_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank>",
+               .help = "print bank information",
+       },
+       {
+               .name = "erase_check",
+               .handler = &handle_flash_erase_check_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank>",
+               .help = "check erase state of sectors",
+       },
+       {
+               .name = "protect_check",
+               .handler = &handle_flash_protect_check_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank>",
+               .help = "check protection state of sectors",
+       },
+       {
+               .name = "erase_sector",
+               .handler = &handle_flash_erase_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> <first> <last>",
+               .help = "erase sectors",
+       },
+       {
+               .name = "erase_address",
+               .handler = &handle_flash_erase_address_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<address> <length>",
+               .help = "erase address range",
+
+       },
+       {
+               .name = "fillw",
+               .handler = &handle_flash_fill_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> <address> <word_pattern> <count>",
+               .help = "fill with pattern (no autoerase)",
+       },
+       {
+               .name = "fillh",
+               .handler = &handle_flash_fill_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> <address> <halfword_pattern> <count>",
+               .help = "fill with pattern",
+       },
+       {
+               .name = "fillb",
+               .handler = &handle_flash_fill_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> <address> <byte_pattern> <count>",
+               .help = "fill with pattern",
+
+       },
+       {
+               .name = "write_bank",
+               .handler = &handle_flash_write_bank_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> <file> <offset>",
+               .help = "write binary data",
+       },
+       {
+               .name = "write_image",
+               .handler = &handle_flash_write_image_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> [erase] [unlock] <file> [offset] [type]",
+               .help = "write an image to flash"
+       },
+       {
+               .name = "protect",
+               .handler = &handle_flash_protect_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> <first> <last> <on | off>",
+               .help = "set protection of sectors",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 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;
 
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "info",
-                       handle_flash_info_command, COMMAND_EXEC,
-                       "print info about flash bank <num>");
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "probe",
-                       handle_flash_probe_command, COMMAND_EXEC,
-                       "identify flash bank <num>");
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "erase_check",
-                       handle_flash_erase_check_command, COMMAND_EXEC,
-                       "check erase state of sectors in flash bank <num>");
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "protect_check",
-                       handle_flash_protect_check_command, COMMAND_EXEC,
-                       "check protection state of sectors in flash bank <num>");
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "erase_sector",
-                       handle_flash_erase_command, COMMAND_EXEC,
-                       "erase sectors at <bank> <first> <last>");
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "erase_address",
-                       handle_flash_erase_address_command, COMMAND_EXEC,
-                       "erase address range <address> <length>");
-
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "fillw",
-                       handle_flash_fill_command, COMMAND_EXEC,
-                       "fill with pattern (no autoerase) <address> <word_pattern> <count>");
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "fillh",
-                       handle_flash_fill_command, COMMAND_EXEC,
-                       "fill with pattern <address> <halfword_pattern> <count>");
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "fillb",
-                       handle_flash_fill_command, COMMAND_EXEC,
-                       "fill with pattern <address> <byte_pattern> <count>");
-
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "write_bank",
-                       handle_flash_write_bank_command, COMMAND_EXEC,
-                       "write binary data to <bank> <file> <offset>");
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "write_image",
-                       handle_flash_write_image_command, COMMAND_EXEC,
-                       "write_image [erase] [unlock] <file> [offset] [type]");
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "protect",
-                       handle_flash_protect_command, COMMAND_EXEC,
-                       "set protection of sectors at <bank> <first> <last> <on | off>");
+       struct command *parent = command_find_in_context(cmd_ctx, "flash");
+       return register_commands(cmd_ctx, parent, flash_exec_command_handlers);
+}
 
-       return ERROR_OK;
+COMMAND_HANDLER(handle_flash_init_command)
+{
+       if (CMD_ARGC != 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       static bool flash_initialized = false;
+       if (flash_initialized)
+       {
+               LOG_INFO("'flash init' has already been called");
+               return ERROR_OK;
+       }
+       flash_initialized = true;
+
+       LOG_DEBUG("Initializing flash devices...");
+       return flash_init_drivers(CMD_CTX);
 }
 
+static const struct command_registration flash_config_command_handlers[] = {
+       {
+               .name = "bank",
+               .handler = &handle_flash_bank_command,
+               .mode = COMMAND_CONFIG,
+               .usage = "<name> <driver> <base> <size> "
+                       "<chip_width> <bus_width> <target> "
+                       "[driver_options ...]",
+               .help = "Define a new bank with the given name, "
+                       "using the specified NOR flash driver.",
+       },
+       {
+               .name = "init",
+               .mode = COMMAND_CONFIG,
+               .handler = &handle_flash_init_command,
+               .help = "initialize flash devices",
+       },
+       {
+               .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[] = {
+       {
+               .name = "flash",
+               .mode = COMMAND_ANY,
+               .help = "NOR flash command group",
+               .chain = flash_config_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 int flash_register_commands(struct command_context *cmd_ctx)
 {
-       flash_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "flash",
-                       NULL, COMMAND_ANY, NULL);
-
-       COMMAND_REGISTER(cmd_ctx, flash_cmd, "bank",
-                       handle_flash_bank_command, COMMAND_CONFIG,
-                       "flash bank <driver> <base> <size> "
-                       "<chip_width> <bus_width> <target> [driver_options ...]");
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, flash_command_handlers);
 }
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)