This is an automated email from Gerrit. "Tomas Vanek <[email protected]>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9604
-- gerrit commit 3a877ad447df39c62251abbc2c3a8a09f0e07f04 Author: Tomas Vanek <[email protected]> Date: Tue Apr 28 17:14:46 2026 +0200 target: rename srst_asserted and power_dropout variables Add sensed_ prefix to make sure the variables are not mismatched mainly with the active srst control ones. While on it update sense_handler() comment No functional change. int type variables misused as a bool left as is. Change-Id: I208196b59588acab2da38602449d5666f5e0395f Signed-off-by: Tomas Vanek <[email protected]> diff --git a/src/target/target.c b/src/target/target.c index 71a2e94427..ad7a9d0118 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -2814,10 +2814,10 @@ COMMAND_HANDLER(handle_targets_command) return retval; } -/* every 300ms we check for reset & powerdropout and issue a "reset halt" if so. */ +/* every polling_interval we check for reset & powerdropout */ -static int power_dropout; -static int srst_asserted; +static int sensed_power_dropout; +static int sensed_srst_asserted; static int run_power_restore; static int run_power_dropout; @@ -2829,29 +2829,29 @@ static int sense_handler(void) static int prev_srst_asserted; static int prev_power_dropout; - int retval = jtag_power_dropout(&power_dropout); + int retval = jtag_power_dropout(&sensed_power_dropout); if (retval != ERROR_OK) return retval; int power_restored; - power_restored = prev_power_dropout && !power_dropout; + power_restored = prev_power_dropout && !sensed_power_dropout; if (power_restored) run_power_restore = 1; int64_t current = timeval_ms(); static int64_t last_power; bool wait_more = last_power + 2000 > current; - if (power_dropout && !wait_more) { + if (sensed_power_dropout && !wait_more) { run_power_dropout = 1; last_power = current; } - retval = jtag_srst_asserted(&srst_asserted); + retval = jtag_srst_asserted(&sensed_srst_asserted); if (retval != ERROR_OK) return retval; int srst_deasserted; - srst_deasserted = prev_srst_asserted && !srst_asserted; + srst_deasserted = prev_srst_asserted && !sensed_srst_asserted; static int64_t last_srst; wait_more = last_srst + 2000 > current; @@ -2860,11 +2860,11 @@ static int sense_handler(void) last_srst = current; } - if (!prev_srst_asserted && srst_asserted) + if (!prev_srst_asserted && sensed_srst_asserted) run_srst_asserted = 1; - prev_srst_asserted = srst_asserted; - prev_power_dropout = power_dropout; + prev_srst_asserted = sensed_srst_asserted; + prev_power_dropout = sensed_power_dropout; if (srst_deasserted || power_restored) { /* Other than logging the event we can't do anything here. @@ -2944,7 +2944,7 @@ static int handle_target(void *priv) recursive = 0; } - if (power_dropout || srst_asserted) + if (sensed_power_dropout || sensed_srst_asserted) return ERROR_OK; int retval = ERROR_OK; --
