diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2024-02-01 10:55:51 +0100 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2024-02-11 23:07:46 +0000 |
| commit | 81a50d3e9050eed8f4d95622f2b326054a200b93 (patch) | |
| tree | c599ac22855e7b73fd7becfb746aa8682b195020 | |
| parent | d0548940f289fbb6c3ce61106799aa56ec20f188 (diff) | |
| download | riscv-openocd-81a50d3e9050eed8f4d95622f2b326054a200b93.zip riscv-openocd-81a50d3e9050eed8f4d95622f2b326054a200b93.tar.gz riscv-openocd-81a50d3e9050eed8f4d95622f2b326054a200b93.tar.bz2 | |
jtag: fix jtag configure command containing events
Commit ea2e26f7d521 ("jtag: rewrite jim_jtag_configure() as
COMMAND_HANDLER") breaks the option -event if it is the last of
the command line.
This can be tested, even without any device connected, through:
#> openocd -f board/ti_cc26x0_launchpad.cfg
wrong # args: should be "-event <event-name> <event-body>"
Fix the check on available arguments after -event.
Change-Id: Iec1522238f906d61a888a09a7685acd9ac6442a7
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reported-by: Lorenz Brun <lorenz@brun.one>
Fixes: ea2e26f7d521 ("jtag: rewrite jim_jtag_configure() as COMMAND_HANDLER")
Reviewed-on: https://review.openocd.org/c/openocd/+/8125
Tested-by: jenkins
Reviewed-by: Lorenz Brun <lorenz@brun.one>
| -rw-r--r-- | src/jtag/tcl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index 163edfa..7995529 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -315,7 +315,7 @@ __COMMAND_HANDLER(handle_jtag_configure) const struct nvp *n = nvp_name2value(nvp_config_opts, CMD_ARGV[i]); switch (n->value) { case JCFG_EVENT: - if (i + (is_configure ? 3 : 2) >= CMD_ARGC) { + if (i + (is_configure ? 2 : 1) >= CMD_ARGC) { command_print(CMD, "wrong # args: should be \"-event <event-name>%s\"", is_configure ? " <event-body>" : ""); return ERROR_COMMAND_ARGUMENT_INVALID; |