[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1083-gbeb610555

[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  beb610555ad826dda874eee0428deeb1c00ac39d (commit)
      from  066aa24e85532b555e1fd34850327e7f7a570bf8 (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 beb610555ad826dda874eee0428deeb1c00ac39d
Author: Antonio Borneo <bor...@gm...>
Date:   Thu Jan 23 15:18:33 2020 +0100

    adi_v5_dapdirect: fix connect under reset
    
    Deassert the reset only if connect under reset is not required;
    otherwise, assert the reset.
    This fix aligns the behavior of connect under reset in dapdirect
    with the behavior in jtag and swd.
    
    Change-Id: I937ef4320b44e51ef6cb0e349e12348dbfbe4abb
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5415
    Tested-by: jenkins

diff --git a/src/target/adi_v5_dapdirect.c b/src/target/adi_v5_dapdirect.c
index f12015198..c0deee165 100644
--- a/src/target/adi_v5_dapdirect.c
+++ b/src/target/adi_v5_dapdirect.c
@@ -179,9 +179,18 @@ static int dapdirect_swd_select(struct command_context *ctx)
 
 static int dapdirect_init(struct command_context *ctx)
 {
+	enum reset_types jtag_reset_config = jtag_get_reset_config();
+
 	LOG_DEBUG("dapdirect_init()");
 
-	adapter_deassert_reset();
+	if (jtag_reset_config & RESET_CNCT_UNDER_SRST) {
+		if (jtag_reset_config & RESET_SRST_NO_GATING)
+			adapter_assert_reset();
+		else
+			LOG_WARNING("\'srst_nogate\' reset_config option is required");
+	} else
+		adapter_deassert_reset();
+
 	return ERROR_OK;
 }
 

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

Summary of changes:
 src/target/adi_v5_dapdirect.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository