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

transport: rewrite command 'transport select' as COMMAND_HANDLER 

The mixed use of jim commands and OpenOCD commands is error prone
due to handling of errors through JIM_xx and ERROR_yy.

Rewrite the jim command 'transport select' as OpenOCD command.
This fixes and incorrect check for the return value of function
transport_select(); it returns ERROR_yy but the check is on JIM_xx.
While there, fix the coding style.

Change-Id: I9f3e8394c1a0cc0312b414c58275e1220217bbed
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7485
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2022-12-18 15:26:56 +01:00
parent 1ec8b83cbd
commit d05c686671
1 changed files with 52 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/transport/transport.c
View File

@ -252,64 +252,62 @@ COMMAND_HANDLER(handle_transport_list)
* set supported by the debug adapter being used. Return value * set supported by the debug adapter being used. Return value
* is scriptable (allowing "if swd then..." etc). * is scriptable (allowing "if swd then..." etc).
*/ */
static int jim_transport_select(Jim_Interp *interp, int argc, Jim_Obj * const *argv) COMMAND_HANDLER(handle_transport_select)
{ {
int res; if (CMD_ARGC > 1)
switch (argc) { return ERROR_COMMAND_SYNTAX_ERROR;
case 1: /* autoselect if necessary, then return/display current config */
if (!session) {
if (!allowed_transports) {
LOG_ERROR("Debug adapter does not support any transports? Check config file order.");
return JIM_ERR;
}
LOG_INFO("auto-selecting first available session transport \"%s\". "
"To override use 'transport select <transport>'.", allowed_transports[0]);
res = transport_select(global_cmd_ctx, allowed_transports[0]);
if (res != JIM_OK)
return res;
}
Jim_SetResultString(interp, session->name, -1);
return JIM_OK;
case 2: /* assign */
if (session) {
if (!strcmp(session->name, argv[1]->bytes)) {
LOG_WARNING("Transport \"%s\" was already selected", session->name);
Jim_SetResultString(interp, session->name, -1);
return JIM_OK;
} else {
LOG_ERROR("Can't change session's transport after the initial selection was made");
return JIM_ERR;
}
}
/* Is this transport supported by our debug adapter? if (CMD_ARGC == 0) {
* Example, "JTAG-only" means SWD is not supported. /* autoselect if necessary, then return/display current config */
* if (!session) {
* NOTE: requires adapter to have been set up, with
* transports declared via C.
*/
if (!allowed_transports) { if (!allowed_transports) {
LOG_ERROR("Debug adapter doesn't support any transports?"); command_print(CMD, "Debug adapter does not support any transports? Check config file order.");
return JIM_ERR; return ERROR_FAIL;
} }
LOG_INFO("auto-selecting first available session transport \"%s\". "
for (unsigned i = 0; allowed_transports[i]; i++) { "To override use 'transport select <transport>'.", allowed_transports[0]);
int retval = transport_select(CMD_CTX, allowed_transports[0]);
if (strcmp(allowed_transports[i], argv[1]->bytes) == 0) { if (retval != ERROR_OK)
if (transport_select(global_cmd_ctx, argv[1]->bytes) == ERROR_OK) { return retval;
Jim_SetResultString(interp, session->name, -1); }
return JIM_OK; command_print(CMD, "%s", session->name);
} return ERROR_OK;
return JIM_ERR;
}
}
LOG_ERROR("Debug adapter doesn't support '%s' transport", argv[1]->bytes);
return JIM_ERR;
default:
Jim_WrongNumArgs(interp, 1, argv, "[too many parameters]");
return JIM_ERR;
} }
/* assign transport */
if (session) {
if (!strcmp(session->name, CMD_ARGV[0])) {
LOG_WARNING("Transport \"%s\" was already selected", session->name);
command_print(CMD, "%s", session->name);
return ERROR_OK;
}
command_print(CMD, "Can't change session's transport after the initial selection was made");
return ERROR_FAIL;
}
/* Is this transport supported by our debug adapter?
* Example, "JTAG-only" means SWD is not supported.
*
* NOTE: requires adapter to have been set up, with
* transports declared via C.
*/
if (!allowed_transports) {
command_print(CMD, "Debug adapter doesn't support any transports?");
return ERROR_FAIL;
}
for (unsigned int i = 0; allowed_transports[i]; i++) {
if (!strcmp(allowed_transports[i], CMD_ARGV[0])) {
int retval = transport_select(CMD_CTX, CMD_ARGV[0]);
if (retval != ERROR_OK)
return retval;
command_print(CMD, "%s", session->name);
return ERROR_OK;
}
}
command_print(CMD, "Debug adapter doesn't support '%s' transport", CMD_ARGV[0]);
return ERROR_FAIL;
} }
static const struct command_registration transport_commands[] = { static const struct command_registration transport_commands[] = {
@ -333,7 +331,7 @@ static const struct command_registration transport_commands[] = {
}, },
{ {
.name = "select", .name = "select",
.jim_handler = jim_transport_select, .handler = handle_transport_select,
.mode = COMMAND_ANY, .mode = COMMAND_ANY,
.help = "Select this session's transport", .help = "Select this session's transport",
.usage = "[transport_name]", .usage = "[transport_name]",