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

jtag: rewrite command 'jtag arp_init-reset' as COMMAND_HANDLER 

While there add the mandatory 'usage' field.

Change-Id: I316fb31e24e94985dcc724e428b0384be7ef5bdd
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7496
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2022-12-19 18:23:11 +01:00
parent ff0fdcf614
commit 254598ba25
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/jtag/tcl.c
View File

@ -672,27 +672,18 @@ COMMAND_HANDLER(handle_jtag_arp_init)
return jtag_init_inner(CMD_CTX); return jtag_init_inner(CMD_CTX);
} }
static int jim_jtag_arp_init_reset(Jim_Interp *interp, int argc, Jim_Obj *const *argv) COMMAND_HANDLER(handle_jtag_arp_init_reset)
{ {
int e = ERROR_OK; if (CMD_ARGC != 0)
struct jim_getopt_info goi; return ERROR_COMMAND_SYNTAX_ERROR;
jim_getopt_setup(&goi, interp, argc-1, argv + 1);
if (goi.argc != 0) {
Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
return JIM_ERR;
}
struct command_context *context = current_command_context(interp);
if (transport_is_jtag())
e = jtag_init_reset(context);
else if (transport_is_swd())
e = swd_init_reset(context);
if (e != ERROR_OK) { if (transport_is_jtag())
Jim_Obj *obj = Jim_NewIntObj(goi.interp, e); return jtag_init_reset(CMD_CTX);
Jim_SetResultFormatted(goi.interp, "error: %#s", obj);
return JIM_ERR; if (transport_is_swd())
} return swd_init_reset(CMD_CTX);
return JIM_OK;
return ERROR_OK;
} }
int jim_jtag_newtap(Jim_Interp *interp, int argc, Jim_Obj *const *argv) int jim_jtag_newtap(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
@ -842,9 +833,10 @@ static const struct command_registration jtag_subcommand_handlers[] = {
{ {
.name = "arp_init-reset", .name = "arp_init-reset",
.mode = COMMAND_ANY, .mode = COMMAND_ANY,
.jim_handler = jim_jtag_arp_init_reset, .handler = handle_jtag_arp_init_reset,
.help = "Uses TRST and SRST to try resetting everything on " .help = "Uses TRST and SRST to try resetting everything on "
"the JTAG scan chain, then performs 'jtag arp_init'." "the JTAG scan chain, then performs 'jtag arp_init'.",
.usage = "",
}, },
{ {
.name = "newtap", .name = "newtap",