[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-113-g277412525

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  27741252571d7c34b9049275d02cf6c34b1ae7d2 (commit)
       via  19e2a0d6af3783e572a80e4cbf0f471f6dbf66e7 (commit)
      from  5da4ef25c8a2e57325bc1706c07f54cc99ce0ce1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 27741252571d7c34b9049275d02cf6c34b1ae7d2
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Dec 19 18:08:03 2022 +0100

    jtag: rewrite command 'jtag names' as COMMAND_HANDLER
    
    While there:
    - format in a human readable way the output list by using one line
      per tap name;
    - add the mandatory 'usage' field.
    
    Change-Id: I295449220c78fac8973478b265413342ea832f61
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7494
    Tested-by: jenkins

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index fc0d562e2..83cb0a18b 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -805,24 +805,15 @@ int jim_jtag_configure(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	return jtag_tap_configure_cmd(&goi, t);
 }
 
-static int jim_jtag_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+COMMAND_HANDLER(handle_jtag_names)
 {
-	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, "Too many parameters");
-		return JIM_ERR;
-	}
-	Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0));
-	struct jtag_tap *tap;
+	if (CMD_ARGC != 0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	for (tap = jtag_all_taps(); tap; tap = tap->next_tap) {
-		Jim_ListAppendElement(goi.interp,
-			Jim_GetResult(goi.interp),
-			Jim_NewStringObj(goi.interp,
-				tap->dotted_name, -1));
-	}
-	return JIM_OK;
+	for (struct jtag_tap *tap = jtag_all_taps(); tap; tap = tap->next_tap)
+		command_print(CMD, "%s", tap->dotted_name);
+
+	return ERROR_OK;
 }
 
 COMMAND_HANDLER(handle_jtag_init_command)
@@ -921,8 +912,9 @@ static const struct command_registration jtag_subcommand_handlers[] = {
 	{
 		.name = "names",
 		.mode = COMMAND_ANY,
-		.jim_handler = jim_jtag_names,
+		.handler = handle_jtag_names,
 		.help = "Returns list of all JTAG tap names.",
+		.usage = "",
 	},
 	{
 		.chain = jtag_command_handlers_to_move,

commit 19e2a0d6af3783e572a80e4cbf0f471f6dbf66e7
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Dec 18 22:11:14 2022 +0100

    jtag: rewrite command 'adapter name' as COMMAND_HANDLER
    
    Trivial change.
    Add the mandatory 'usage' field.
    
    Change-Id: Id92af5cd873fb86f5de79f785f156d1ef734b005
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7493
    Tested-by: jenkins

diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index eb73fcb9a..76a6620be 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -378,21 +378,18 @@ done:
 	return equal;
 }
 
-static int jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
+COMMAND_HANDLER(handle_adapter_name)
 {
-	struct jim_getopt_info goi;
-	jim_getopt_setup(&goi, interp, argc-1, argv + 1);
-
 	/* return the name of the interface */
 	/* TCL code might need to know the exact type... */
 	/* FUTURE: we allow this as a means to "set" the interface. */
-	if (goi.argc != 0) {
-		Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
-		return JIM_ERR;
-	}
-	const char *name = adapter_driver ? adapter_driver->name : NULL;
-	Jim_SetResultString(goi.interp, name ? name : "undefined", -1);
-	return JIM_OK;
+
+	if (CMD_ARGC != 0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	command_print(CMD, "%s", adapter_driver ? adapter_driver->name : "undefined");
+
+	return ERROR_OK;
 }
 
 COMMAND_HANDLER(adapter_transports_command)
@@ -1127,9 +1124,10 @@ static const struct command_registration adapter_command_handlers[] = {
 	{
 		.name = "name",
 		.mode = COMMAND_ANY,
-		.jim_handler = jim_adapter_name,
+		.handler = handle_adapter_name,
 		.help = "Returns the name of the currently "
 			"selected adapter (driver)",
+		.usage = "",
 	},
 	{
 		.name = "srst",

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/adapter.c | 22 ++++++++++------------
 src/jtag/tcl.c     | 26 +++++++++-----------------
 2 files changed, 19 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository