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

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index f154295dd4932adf3d0018bbd25a4b00907ff1e6..c6ca048104258f662a65024ef3ba853767176e42 100644 (file)
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -672,27 +672,18 @@ COMMAND_HANDLER(handle_jtag_arp_init)
        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;
-       struct jim_getopt_info goi;
-       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 (CMD_ARGC != 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        if (transport_is_jtag())
-               e = jtag_init_reset(context);
-       else if (transport_is_swd())
-               e = swd_init_reset(context);
+               return jtag_init_reset(CMD_CTX);
 
-       if (e != ERROR_OK) {
-               Jim_Obj *obj = Jim_NewIntObj(goi.interp, e);
-               Jim_SetResultFormatted(goi.interp, "error: %#s", obj);
-               return JIM_ERR;
-       }
-       return JIM_OK;
+       if (transport_is_swd())
+               return swd_init_reset(CMD_CTX);
+
+       return ERROR_OK;
 }
 
 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",
                .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 "
-                       "the JTAG scan chain, then performs 'jtag arp_init'."
+                       "the JTAG scan chain, then performs 'jtag arp_init'.",
+               .usage = "",
        },
        {
                .name = "newtap",