diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2022-12-19 18:35:23 +0100 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2023-03-25 18:13:46 +0000 |
| commit | f76e67a440bb1761b90ea0cab89e0422a4224779 (patch) | |
| tree | e7e09b2da709e6ec64114989e86ebec107ce74a5 | |
| parent | fbb7a50cbd5b9cda29698b3192e2a4596b3a6371 (diff) | |
| download | riscv-openocd-f76e67a440bb1761b90ea0cab89e0422a4224779.zip riscv-openocd-f76e67a440bb1761b90ea0cab89e0422a4224779.tar.gz riscv-openocd-f76e67a440bb1761b90ea0cab89e0422a4224779.tar.bz2 | |
target: arm_dap: rewrite command 'dap names' as COMMAND_HANDLER
While there, format in a human readable way the output list by
using one line per dap name.
Change-Id: I24a47350105b90db15808c61790f05d807120739
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7498
Tested-by: jenkins
| -rw-r--r-- | src/target/arm_dap.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/target/arm_dap.c b/src/target/arm_dap.c index e21136d..bc9d962 100644 --- a/src/target/arm_dap.c +++ b/src/target/arm_dap.c @@ -421,20 +421,16 @@ static int jim_dap_create(Jim_Interp *interp, int argc, Jim_Obj *const *argv) return dap_create(&goi); } -static int jim_dap_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv) +COMMAND_HANDLER(handle_dap_names) { + if (CMD_ARGC != 0) + return ERROR_COMMAND_SYNTAX_ERROR; + struct arm_dap_object *obj; + list_for_each_entry(obj, &all_dap, lh) + command_print(CMD, "%s", obj->name); - if (argc != 1) { - Jim_WrongNumArgs(interp, 1, argv, "Too many parameters"); - return JIM_ERR; - } - Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0)); - list_for_each_entry(obj, &all_dap, lh) { - Jim_ListAppendElement(interp, Jim_GetResult(interp), - Jim_NewStringObj(interp, obj->name, -1)); - } - return JIM_OK; + return ERROR_OK; } COMMAND_HANDLER(handle_dap_init) @@ -500,7 +496,7 @@ static const struct command_registration dap_subcommand_handlers[] = { { .name = "names", .mode = COMMAND_ANY, - .jim_handler = jim_dap_names, + .handler = handle_dap_names, .usage = "", .help = "Lists all registered DAP instances by name", }, |