auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapter: replace 'interface' with 'adapter driver'

Browse Source 
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 <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/8808
Tested-by: jenkins
Reviewed-by: zapb <dev@zapb.de>
This commit is contained in:
Antonio Borneo
2025-03-16 14:31:01 +01:00
parent cbd7987c7c
commit c3fae34969
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/jtag/adapter.c
+8 -9
View File
@@ -187,7 +187,6 @@ int adapter_init(struct command_context *cmd_ctx)
int adapter_quit(void) int adapter_quit(void)
{ {
if (is_adapter_initialized() && adapter_driver->quit) { if (is_adapter_initialized() && adapter_driver->quit) {
/* close the JTAG interface */
int result = adapter_driver->quit(); int result = adapter_driver->quit();
if (result != ERROR_OK) if (result != ERROR_OK)
LOG_ERROR("failed: %d", result); LOG_ERROR("failed: %d", result);
@@ -380,7 +379,7 @@ done:
COMMAND_HANDLER(handle_adapter_name) 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... */ /* TCL code might need to know the exact type... */
/* FUTURE: we allow this as a means to "set" the interface. */ /* FUTURE: we allow this as a means to "set" the interface. */
@@ -414,14 +413,14 @@ COMMAND_HANDLER(handle_adapter_driver_command)
{ {
int retval; int retval;
/* check whether the interface is already configured */ /* check whether the adapter driver is already configured */
if (adapter_driver) { if (adapter_driver) {
LOG_WARNING("Interface already configured, ignoring"); LOG_WARNING("Adapter driver already configured, ignoring");
return ERROR_OK; return ERROR_OK;
} }
/* interface name is a mandatory argument */ /* adapter driver name is a mandatory argument */
if (CMD_ARGC != 1 || CMD_ARGV[0][0] == '\0') if (CMD_ARGC != 1)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
for (unsigned int i = 0; adapter_drivers[i]; i++) { 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); return allow_transports(CMD_CTX, adapter_driver->transports);
} }
/* no valid interface was found (i.e. the configuration option, /* no valid adapter driver was found (i.e. the configuration option,
* didn't match one of the compiled-in interfaces * 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]); CMD_ARGV[0]);
command_print(CMD, "The following adapter drivers are available:"); command_print(CMD, "The following adapter drivers are available:");
CALL_COMMAND_HANDLER(dump_adapter_driver_list); CALL_COMMAND_HANDLER(dump_adapter_driver_list);