From 31c67cc83083ccc2db49d136a9b0d7227e336dba Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Sat, 6 Apr 2019 16:26:31 +0200 Subject: [PATCH] target: fix output of command "targets" 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 Reviewed-on: http://openocd.zylin.com/5092 Reviewed-by: Tomas Vanek Tested-by: jenkins --- src/target/target.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/target/target.c b/src/target/target.c index 20bf26b5dd..4b4aec83c3 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -2578,23 +2578,23 @@ int target_write_phys_u8(struct target *target, target_addr_t address, uint8_t v 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); 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; } 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", target->tap->dotted_name); return ERROR_FAIL; } - cmd_ctx->current_target = target; - if (cmd_ctx->current_target_override) - cmd_ctx->current_target_override = target; + cmd->ctx->current_target = target; + if (cmd->ctx->current_target_override) + cmd->ctx->current_target_override = target; return ERROR_OK; } @@ -2604,7 +2604,7 @@ COMMAND_HANDLER(handle_targets_command) { int retval = ERROR_OK; if (CMD_ARGC == 1) { - retval = find_target(CMD_CTX, CMD_ARGV[0]); + retval = find_target(CMD, CMD_ARGV[0]); if (retval == ERROR_OK) { /* we're done! */ return retval; -- 2.30.2