diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-11-30 17:27:21 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-12-02 13:26:22 -0800 |
| commit | 747f8af672026f9778c6272ab48405d93b41acad (patch) | |
| tree | 14f6decf9347533d4ca1d8f1598b0ab8da5a0e2b /src | |
| parent | 682910fdc24c8ae970b3cd1e5b4ff7042e0522be (diff) | |
| download | openocd+libswd-747f8af672026f9778c6272ab48405d93b41acad.tar.gz openocd+libswd-747f8af672026f9778c6272ab48405d93b41acad.tar.bz2 openocd+libswd-747f8af672026f9778c6272ab48405d93b41acad.tar.xz openocd+libswd-747f8af672026f9778c6272ab48405d93b41acad.zip | |
nand: factor init to 'nand init'
Split NAND initialization into 'nand init', which gets called from
the main 'init' command.
Diffstat (limited to 'src')
| -rw-r--r-- | src/flash/nand.c | 26 | ||||
| -rw-r--r-- | src/openocd.c | 5 |
2 files changed, 28 insertions, 3 deletions
diff --git a/src/flash/nand.c b/src/flash/nand.c index 94cec8d5..1c8c0c87 100644 --- a/src/flash/nand.c +++ b/src/flash/nand.c @@ -281,6 +281,9 @@ COMMAND_HANDLER(handle_nand_device_command) return CALL_COMMAND_HANDLER(handle_nand_list_drivers); } + +COMMAND_HANDLER(handle_nand_init_command); + static const struct command_registration nand_config_command_handlers[] = { { .name = "device", @@ -294,6 +297,12 @@ static const struct command_registration nand_config_command_handlers[] = { .mode = COMMAND_ANY, .help = "lists available NAND drivers", }, + { + .name = "init", + .mode = COMMAND_CONFIG, + .handler = &handle_nand_init_command, + .help = "initialize NAND devices", + }, COMMAND_REGISTRATION_DONE }; static const struct command_registration nand_command_handlers[] = { @@ -1794,3 +1803,20 @@ int nand_init(struct command_context *cmd_ctx) struct command *parent = command_find_in_context(cmd_ctx, "nand"); return register_commands(cmd_ctx, parent, nand_exec_command_handlers); } + +COMMAND_HANDLER(handle_nand_init_command) +{ + if (CMD_ARGC != 0) + return ERROR_COMMAND_SYNTAX_ERROR; + + static bool nand_initialized = false; + if (nand_initialized) + { + LOG_INFO("'nand init' has already been called"); + return ERROR_OK; + } + nand_initialized = true; + + LOG_DEBUG("Initializing NAND devices..."); + return nand_init(CMD_CTX); +} diff --git a/src/openocd.c b/src/openocd.c index 777e6306..1026379d 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -143,11 +143,10 @@ COMMAND_HANDLER(handle_init_command) return ERROR_FAIL; LOG_DEBUG("mflash init complete"); - if (nand_init(CMD_CTX) != ERROR_OK) + command_context_mode(CMD_CTX, COMMAND_CONFIG); + if (command_run_line(CMD_CTX, "nand init") != ERROR_OK) return ERROR_FAIL; - LOG_DEBUG("NAND init complete"); - command_context_mode(CMD_CTX, COMMAND_CONFIG); if (command_run_line(CMD_CTX, "pld init") != ERROR_OK) return ERROR_FAIL; command_context_mode(CMD_CTX, COMMAND_EXEC); |