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 79a30e77e176e4fb44a4f2a6303e1bcdd8a65fa5..12bcf443c4e5053d675b6e4d70a33919a13ff397 100644 (file)
--- 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 abf8bfd9bbe08427f28927907762315aca293ccb..4013442612dd8489074a89911ef7ee27a59671ca 100644 (file)
--- 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,