diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2022-12-19 18:08:03 +0100 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2023-03-25 18:12:52 +0000 |
| commit | 27741252571d7c34b9049275d02cf6c34b1ae7d2 (patch) | |
| tree | 42e0ed5cb012a385492f5b8cb332fff56e01f15f | |
| parent | 19e2a0d6af3783e572a80e4cbf0f471f6dbf66e7 (diff) | |
| download | riscv-openocd-27741252571d7c34b9049275d02cf6c34b1ae7d2.zip riscv-openocd-27741252571d7c34b9049275d02cf6c34b1ae7d2.tar.gz riscv-openocd-27741252571d7c34b9049275d02cf6c34b1ae7d2.tar.bz2 | |
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 <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7494
Tested-by: jenkins
| -rw-r--r-- | src/jtag/tcl.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index fc0d562..83cb0a1 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, |