interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

target: arm_tpiu_swo: rewrite command 'tpiu disable' as COMMAND_HANDLER 

Change-Id: I689482f898bde2afa2881b2f311676a6b98abb9a
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7499
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2022-12-19 20:28:56 +01:00
parent f76e67a440
commit 8fa6db6e8e
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/target/arm_tpiu_swo.c
View File

@ -820,18 +820,15 @@ error_exit:
return JIM_ERR; return JIM_ERR;
} }
static int jim_arm_tpiu_swo_disable(Jim_Interp *interp, int argc, Jim_Obj *const *argv) COMMAND_HANDLER(handle_arm_tpiu_swo_disable)
{ {
struct command *c = jim_to_command(interp); struct arm_tpiu_swo_object *obj = CMD_DATA;
struct arm_tpiu_swo_object *obj = c->jim_handler_data;
if (argc != 1) { if (CMD_ARGC != 0)
Jim_WrongNumArgs(interp, 1, argv, "Too many parameters"); return ERROR_COMMAND_SYNTAX_ERROR;
return JIM_ERR;
}
if (!obj->enabled) if (!obj->enabled)
return JIM_OK; return ERROR_OK;
obj->enabled = false; obj->enabled = false;
arm_tpiu_swo_handle_event(obj, TPIU_SWO_EVENT_PRE_DISABLE); arm_tpiu_swo_handle_event(obj, TPIU_SWO_EVENT_PRE_DISABLE);
@ -845,20 +842,19 @@ static int jim_arm_tpiu_swo_disable(Jim_Interp *interp, int argc, Jim_Obj *const
int retval = adapter_config_trace(false, 0, 0, NULL, 0, NULL); int retval = adapter_config_trace(false, 0, 0, NULL, 0, NULL);
if (retval != ERROR_OK) { if (retval != ERROR_OK) {
LOG_ERROR("Failed to stop adapter's trace"); command_print(CMD, "Failed to stop adapter's trace");
return JIM_ERR; return retval;
} }
} }
arm_tpiu_swo_handle_event(obj, TPIU_SWO_EVENT_POST_DISABLE); arm_tpiu_swo_handle_event(obj, TPIU_SWO_EVENT_POST_DISABLE);
/* START_DEPRECATED_TPIU */ /* START_DEPRECATED_TPIU */
struct command_context *cmd_ctx = current_command_context(interp); struct target *target = get_current_target(CMD_CTX);
struct target *target = get_current_target(cmd_ctx);
target_handle_event(target, TARGET_EVENT_TRACE_CONFIG); target_handle_event(target, TARGET_EVENT_TRACE_CONFIG);
/* END_DEPRECATED_TPIU */ /* END_DEPRECATED_TPIU */
return JIM_OK; return ERROR_OK;
} }
static const struct command_registration arm_tpiu_swo_instance_command_handlers[] = { static const struct command_registration arm_tpiu_swo_instance_command_handlers[] = {
@ -893,7 +889,7 @@ static const struct command_registration arm_tpiu_swo_instance_command_handlers[
{ {
.name = "disable", .name = "disable",
.mode = COMMAND_EXEC, .mode = COMMAND_EXEC,
.jim_handler = jim_arm_tpiu_swo_disable, .handler = handle_arm_tpiu_swo_disable,
.usage = "", .usage = "",
.help = "Disables the TPIU/SWO output", .help = "Disables the TPIU/SWO output",
}, },