[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1149-g85dc63011

[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  85dc63011378c0a8112f99e3a02fa971f96bbc05 (commit)
      from  b7c13323e702c7aa1d05d952708d1e408c47fae1 (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 85dc63011378c0a8112f99e3a02fa971f96bbc05
Author: Antonio Borneo <bor...@gm...>
Date:   Fri Mar 6 10:30:25 2020 +0100

    jtag: fix command "adapter [de]assert" with dap direct
    
    The commit fafe6dfc9cd8 ("adapter: add command "adapter [de]assert
    srst|trst [[de]assert srst|trst]"") was proposed in gerrit well
    before commit a61ec3c1d73d ("adi_v5_dapdirect: add support for
    adapter drivers that provide DAP API") get merged, so it didn't
    include a complete support for dap direct.
    The merge upstream of the two commits lacks the support by command
    "adapter [de]assert" for dap direct
    
    Let command command "adapter [de]assert" handle dap direct.
    
    Change-Id: I1a69f8ee877c8fd57598ed4ad9d71da61d15457c
    Fixes: commit fafe6dfc9cd8 ("adapter: add command "adapter [de]assert srst|trst [[de]assert srst|trst]"")
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5515
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/jtag/core.c b/src/jtag/core.c
index c5011e522..001523365 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -2021,7 +2021,8 @@ int adapter_resets(int trst, int srst)
 		/* adapters without trst signal will eventually use tlr sequence */
 		jtag_add_reset(trst, srst);
 		return ERROR_OK;
-	} else if (transport_is_swd() || transport_is_hla()) {
+	} else if (transport_is_swd() || transport_is_hla() ||
+			   transport_is_dapdirect_swd() || transport_is_dapdirect_jtag()) {
 		if (trst == TRST_ASSERT) {
 			LOG_ERROR("transport %s has no trst signal",
 				get_current_transport()->name);

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

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


hooks/post-receive
-- 
Main OpenOCD repository