[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-35-g5292c7eae

[openocd-gerrit <ope...@us...>]

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  5292c7eae925d59d6b6c0017b6a4995d39a6e9ee (commit)
      from  630cb5ea4d65edba42d1c77fa17d9fe78f7b38c2 (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 5292c7eae925d59d6b6c0017b6a4995d39a6e9ee
Author: Tomas Vanek <va...@fb...>
Date:   Thu Nov 24 14:21:59 2022 +0100

    jtag/drivers/cmsis_dap: prevent conn/discon workaround before line reset
    
    The line reset SWD sequence is used quite often in SWD multidrop mode.
    Prevent the ugly connect/disconnect adapter firmware bug workaround
    to be called before each line reset.
    
    Signed-off-by: Tomas Vanek <va...@fb...>
    Change-Id: Id85bff075dba9077e4e501e2cdcfd64d5d9d0531
    Reviewed-on: https://review.openocd.org/c/openocd/+/7381
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index d2c30cc79..0c42a7f1e 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -1158,7 +1158,9 @@ static int cmsis_dap_swd_switch_seq(enum swd_special_seq seq)
 	unsigned int s_len;
 	int retval;
 
-	if ((output_pins & (SWJ_PIN_SRST | SWJ_PIN_TRST)) == (SWJ_PIN_SRST | SWJ_PIN_TRST)) {
+	if (seq != LINE_RESET &&
+			(output_pins & (SWJ_PIN_SRST | SWJ_PIN_TRST))
+				== (SWJ_PIN_SRST | SWJ_PIN_TRST)) {
 		/* Following workaround deasserts reset on most adapters.
 		 * Do not reconnect if a reset line is active!
 		 * Reconnecting would break connecting under reset. */

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/drivers/cmsis_dap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository