summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-30 17:20:18 -0800
committerZachary T Welch <zw@superlucidity.net>2009-12-02 13:26:22 -0800
commit682910fdc24c8ae970b3cd1e5b4ff7042e0522be (patch)
treee09765b30d7471ba1c8baf950f0700aba2bdfdb0
parent55eeea7fceb67f29c9a43eeb7993c70214157343 (diff)
downloadopenocd+libswd-682910fdc24c8ae970b3cd1e5b4ff7042e0522be.tar.gz
openocd+libswd-682910fdc24c8ae970b3cd1e5b4ff7042e0522be.tar.bz2
openocd+libswd-682910fdc24c8ae970b3cd1e5b4ff7042e0522be.tar.xz
openocd+libswd-682910fdc24c8ae970b3cd1e5b4ff7042e0522be.zip
pld: factor init to 'pld init'
Split PLD initialization into 'pld init', which gets called from 'init'.
-rw-r--r--src/openocd.c5
-rw-r--r--src/pld/pld.c23
2 files changed, 26 insertions, 2 deletions
diff --git a/src/openocd.c b/src/openocd.c
index 44e02925..777e6306 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -147,9 +147,10 @@ COMMAND_HANDLER(handle_init_command)
return ERROR_FAIL;
LOG_DEBUG("NAND init complete");
- if (pld_init(CMD_CTX) != ERROR_OK)
+ command_context_mode(CMD_CTX, COMMAND_CONFIG);
+ if (command_run_line(CMD_CTX, "pld init") != ERROR_OK)
return ERROR_FAIL;
- LOG_DEBUG("pld init complete");
+ command_context_mode(CMD_CTX, COMMAND_EXEC);
/* initialize telnet subsystem */
gdb_target_add_all(all_targets);
diff --git a/src/pld/pld.c b/src/pld/pld.c
index 24afd07a..df7ac0de 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -213,6 +213,23 @@ int pld_init(struct command_context *cmd_ctx)
return register_commands(cmd_ctx, parent, pld_exec_command_handlers);
}
+COMMAND_HANDLER(handle_pld_init_command)
+{
+ if (CMD_ARGC != 0)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
+ static bool pld_initialized = false;
+ if (pld_initialized)
+ {
+ LOG_INFO("'pld init' has already been called");
+ return ERROR_OK;
+ }
+ pld_initialized = true;
+
+ LOG_DEBUG("Initializing PLDs...");
+ return pld_init(CMD_CTX);
+}
+
static const struct command_registration pld_config_command_handlers[] = {
{
.name = "device",
@@ -221,6 +238,12 @@ static const struct command_registration pld_config_command_handlers[] = {
.help = "configure a PLD device",
.usage = "<driver> ...",
},
+ {
+ .name = "init",
+ .mode = COMMAND_CONFIG,
+ .handler = &handle_pld_init_command,
+ .help = "initialize PLD devices",
+ },
COMMAND_REGISTRATION_DONE
};
static const struct command_registration pld_command_handler[] = {