Commit 62fbb0f5 authored by Zachary T Welch's avatar Zachary T Welch
Browse files

target: factor init to 'target init'

Adds 'target init' command handler, called as part of 'init'.
parent e03f3c57
......@@ -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);
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment