From: Zachary T Welch <zw@superlucidity.net>
Date: Tue, 1 Dec 2009 02:45:38 +0000 (-0800)
Subject: target: factor init to 'target init'
X-Git-Tag: v0.4.0-rc1~225
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=62fbb0f545213f8a813819f319e20fee8a859319

target: factor init to 'target init'

Adds 'target init' command handler, called as part of 'init'.
---

diff --git a/src/openocd.c b/src/openocd.c
index 79a30e77e1..12bcf443c4 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -111,11 +111,9 @@ COMMAND_HANDLER(handle_init_command)
 
 	initialized = 1;
 
-	command_context_mode(CMD_CTX, COMMAND_EXEC);
-
-	if (target_init(CMD_CTX) != ERROR_OK)
+	retval = command_run_line(CMD_CTX, "target init");
+	if (ERROR_OK != retval)
 		return ERROR_FAIL;
-	LOG_DEBUG("target init complete");
 
 	if ((retval = jtag_interface_init(CMD_CTX)) != ERROR_OK)
 	{
@@ -126,7 +124,6 @@ COMMAND_HANDLER(handle_init_command)
 
 	/* Try to initialize & examine the JTAG chain at this point, but
 	 * continue startup regardless */
-	command_context_mode(CMD_CTX, COMMAND_CONFIG);
 	if (command_run_line(CMD_CTX, "jtag init") == ERROR_OK)
 	{
 		command_context_mode(CMD_CTX, COMMAND_EXEC);
diff --git a/src/target/target.c b/src/target/target.c
index abf8bfd9bb..4013442612 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -787,6 +787,23 @@ int target_init(struct command_context *cmd_ctx)
 	return ERROR_OK;
 }
 
+COMMAND_HANDLER(handle_target_init_command)
+{
+	if (CMD_ARGC != 0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	static bool target_initialized = false;
+	if (target_initialized)
+	{
+		LOG_INFO("'target init' has already been called");
+		return ERROR_OK;
+	}
+	target_initialized = true;
+
+	LOG_DEBUG("Initializing targets...");
+	return target_init(CMD_CTX);
+}
+
 int target_register_event_callback(int (*callback)(struct target *target, enum target_event event, void *priv), void *priv)
 {
 	struct target_event_callback **callbacks_p = &target_event_callbacks;
@@ -4786,6 +4803,12 @@ COMMAND_HANDLER(handle_fast_load_command)
 }
 
 static const struct command_registration target_command_handlers[] = {
+	{
+		.name = "init",
+		.mode = COMMAND_CONFIG,
+		.handler = &handle_target_init_command,
+		.help = "initialize targets",
+	},
 	{
 		.name = "targets",
 		.handler = &handle_targets_command,