From: openocd-gerrit <ope...@us...> - 2024-08-02 16:06:44
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via 4cab20b599885885cdcba850af6b57310e695412 (commit) from fc0ec6cf0bf257e9304f9b57d4db8a22957e3755 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4cab20b599885885cdcba850af6b57310e695412 Author: Marc Schink <de...@za...> Date: Wed Jul 24 20:39:57 2024 +0200 adapter/jlink: Allow to determine the target power state Change-Id: I0b4f543e0ba0e48c43f78e32e4fa41d7dec9d7b8 Signed-off-by: Marc Schink <de...@za...> Reviewed-on: https://review.openocd.org/c/openocd/+/8417 Reviewed-by: Antonio Borneo <bor...@gm...> Tested-by: jenkins diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c index f9b500e6b..a94f3a4ab 100644 --- a/src/jtag/drivers/jlink.c +++ b/src/jtag/drivers/jlink.c @@ -1069,7 +1069,7 @@ COMMAND_HANDLER(jlink_handle_jlink_jtag_command) COMMAND_HANDLER(jlink_handle_target_power_command) { - if (CMD_ARGC != 1) + if (CMD_ARGC > 1) return ERROR_COMMAND_SYNTAX_ERROR; if (!jaylink_has_cap(caps, JAYLINK_DEV_CAP_SET_TARGET_POWER)) { @@ -1078,6 +1078,20 @@ COMMAND_HANDLER(jlink_handle_target_power_command) return ERROR_OK; } + if (!CMD_ARGC) { + uint32_t state; + int ret = jaylink_get_hardware_info(devh, JAYLINK_HW_INFO_TARGET_POWER, + &state); + + if (ret != JAYLINK_OK) { + command_print(CMD, "Failed to retrieve target power state"); + return ERROR_FAIL; + } + + command_print(CMD, "%d", (bool)state); + return ERROR_OK; + } + bool enable; COMMAND_PARSE_ON_OFF(CMD_ARGV[0], enable); @@ -1859,7 +1873,7 @@ static const struct command_registration jlink_subcommand_handlers[] = { .handler = &jlink_handle_target_power_command, .mode = COMMAND_EXEC, .help = "set the target power supply", - .usage = "<0|1|on|off>" + .usage = "[0|1|on|off]" }, { .name = "freemem", ----------------------------------------------------------------------- Summary of changes: src/jtag/drivers/jlink.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) hooks/post-receive -- Main OpenOCD repository |