imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target: fix output of command "targets"

Browse Source 
Part of the output is generated with log functions.

Change prototype of find_target() and use command_print() for all
the output of the command.

Change-Id: Ia9fdb653fd5b27be427381053a037545faa34414
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5092
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2019-04-06 16:26:31 +02:00 committed by Tomas Vanek
parent 3605cb9625
commit 31c67cc830
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/target/target.c
View File

@ -2578,23 +2578,23 @@ int target_write_phys_u8(struct target *target, target_addr_t address, uint8_t v
return retval; return retval;
} }
static int find_target(struct command_context *cmd_ctx, const char *name) static int find_target(struct command_invocation *cmd, const char *name)
{ {
struct target *target = get_target(name); struct target *target = get_target(name);
if (target == NULL) { if (target == NULL) {
LOG_ERROR("Target: %s is unknown, try one of:\n", name); command_print(cmd, "Target: %s is unknown, try one of:\n", name);
return ERROR_FAIL; return ERROR_FAIL;
} }
if (!target->tap->enabled) { if (!target->tap->enabled) {
LOG_USER("Target: TAP %s is disabled, " command_print(cmd, "Target: TAP %s is disabled, "
"can't be the current target\n", "can't be the current target\n",
target->tap->dotted_name); target->tap->dotted_name);
return ERROR_FAIL; return ERROR_FAIL;
} }
cmd_ctx->current_target = target; cmd->ctx->current_target = target;
if (cmd_ctx->current_target_override) if (cmd->ctx->current_target_override)
cmd_ctx->current_target_override = target; cmd->ctx->current_target_override = target;
return ERROR_OK; return ERROR_OK;
} }
@ -2604,7 +2604,7 @@ COMMAND_HANDLER(handle_targets_command)
{ {
int retval = ERROR_OK; int retval = ERROR_OK;
if (CMD_ARGC == 1) { if (CMD_ARGC == 1) {
retval = find_target(CMD_CTX, CMD_ARGV[0]); retval = find_target(CMD, CMD_ARGV[0]);
if (retval == ERROR_OK) { if (retval == ERROR_OK) {
/* we're done! */ /* we're done! */
return retval; return retval;