diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-30 17:38:02 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-12-02 13:26:22 -0800 |
| commit | 37201c019ffc6b806aa61bf2eb8fc18c58083f02 (patch) | |
| tree | 7d97714a0f11462daadbd1262c7d4fefc6d5a516 | |
| parent | 1de0b9d351313f186433f4d71d31241c95665cbf (diff) | |
| download | openocd_libswd-37201c019ffc6b806aa61bf2eb8fc18c58083f02.tar.gz openocd_libswd-37201c019ffc6b806aa61bf2eb8fc18c58083f02.tar.bz2 openocd_libswd-37201c019ffc6b806aa61bf2eb8fc18c58083f02.tar.xz openocd_libswd-37201c019ffc6b806aa61bf2eb8fc18c58083f02.zip | |
flash: factor init to 'flash init'
Split flash initialiation into 'flash init', called from 'init'.
| -rw-r--r-- | src/flash/flash.c | 23 | ||||
| -rw-r--r-- | src/openocd.c | 5 |
2 files changed, 25 insertions, 3 deletions
diff --git a/src/flash/flash.c b/src/flash/flash.c index 7023ef97..1e5ac9a3 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -1375,6 +1375,23 @@ int flash_init_drivers(struct command_context *cmd_ctx) return register_commands(cmd_ctx, parent, flash_exec_command_handlers); } +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", @@ -1387,6 +1404,12 @@ static const struct command_registration flash_config_command_handlers[] = { "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, diff --git a/src/openocd.c b/src/openocd.c index ff35f878..aaa45314 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -135,11 +135,10 @@ COMMAND_HANDLER(handle_init_command) } } - if (flash_init_drivers(CMD_CTX) != ERROR_OK) + command_context_mode(CMD_CTX, COMMAND_CONFIG); + if (command_run_line(CMD_CTX, "flash init") != ERROR_OK) return ERROR_FAIL; - LOG_DEBUG("flash init complete"); - command_context_mode(CMD_CTX, COMMAND_CONFIG); if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK) return ERROR_FAIL; |