[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-965-gc3fae3496

[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  c3fae349692c7c2d0eac95a04da648ba95a558a0 (commit)
      from  cbd7987c7ca2656b60bc8964bb1d9b7819e66ccb (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 c3fae349692c7c2d0eac95a04da648ba95a558a0
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Mar 16 14:31:01 2025 +0100

    adapter: replace 'interface' with 'adapter driver'
    
    Comments and output strings still reference the term 'interface',
    while 'adapter driver' should be used.
    
    While there, drop the useless test if CMD_ARGV[0] is an empty
    string, as this is not possible when CMD_ARGC > 0.
    
    Change-Id: I7b46b5dd3cec53d8b5b7559d941ee9ae3bd1d89b
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8808
    Tested-by: jenkins
    Reviewed-by: zapb <de...@za...>

diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index 2fcbd609e..0bdfe7b13 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -187,7 +187,6 @@ int adapter_init(struct command_context *cmd_ctx)
 int adapter_quit(void)
 {
 	if (is_adapter_initialized() && adapter_driver->quit) {
-		/* close the JTAG interface */
 		int result = adapter_driver->quit();
 		if (result != ERROR_OK)
 			LOG_ERROR("failed: %d", result);
@@ -380,7 +379,7 @@ done:
 
 COMMAND_HANDLER(handle_adapter_name)
 {
-	/* return the name of the interface */
+	/* return the name of the adapter driver */
 	/* TCL code might need to know the exact type... */
 	/* FUTURE: we allow this as a means to "set" the interface. */
 
@@ -414,14 +413,14 @@ COMMAND_HANDLER(handle_adapter_driver_command)
 {
 	int retval;
 
-	/* check whether the interface is already configured */
+	/* check whether the adapter driver is already configured */
 	if (adapter_driver) {
-		LOG_WARNING("Interface already configured, ignoring");
+		LOG_WARNING("Adapter driver already configured, ignoring");
 		return ERROR_OK;
 	}
 
-	/* interface name is a mandatory argument */
-	if (CMD_ARGC != 1 || CMD_ARGV[0][0] == '\0')
+	/* adapter driver name is a mandatory argument */
+	if (CMD_ARGC != 1)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	for (unsigned int i = 0; adapter_drivers[i]; i++) {
@@ -439,10 +438,10 @@ COMMAND_HANDLER(handle_adapter_driver_command)
 		return allow_transports(CMD_CTX, adapter_driver->transports);
 	}
 
-	/* no valid interface was found (i.e. the configuration option,
-	 * didn't match one of the compiled-in interfaces
+	/* no valid adapter driver was found (i.e. the configuration option,
+	 * didn't match one of the compiled-in drivers
 	 */
-	LOG_ERROR("The specified debug interface was not found (%s)",
+	LOG_ERROR("The specified adapter driver was not found (%s)",
 				CMD_ARGV[0]);
 	command_print(CMD, "The following adapter drivers are available:");
 	CALL_COMMAND_HANDLER(dump_adapter_driver_list);

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

Summary of changes:
 src/jtag/adapter.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository