[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-488-g74807daeb

[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  74807daeb36a3be891913d2e03e58d0a23b6fcb9 (commit)
      from  c7073853ebcbb8a94af0ef405cb05f94b7fd02e5 (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 74807daeb36a3be891913d2e03e58d0a23b6fcb9
Author: Ahmed BOUDJELIDA <abo...@na...>
Date:   Mon Dec 4 10:58:05 2023 +0100

    jtag/drivers: correct the angie_reset function
    
    remove angie_clear_queue function from executing before the
    angie_execute_queued_commands function and making it at the
    end of the reset function.
    
    Change-Id: Id8a0664fbd5b8f9730545ce0f8f272ae0b0e7e78
    Signed-off-by: Ahmed BOUDJELIDA <abo...@na...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7990
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/angie.c b/src/jtag/drivers/angie.c
index b7d1f8ac3..79195a947 100644
--- a/src/jtag/drivers/angie.c
+++ b/src/jtag/drivers/angie.c
@@ -1725,14 +1725,16 @@ static int angie_reset(int trst, int srst)
 		high |= SIGNAL_SRST;
 
 	int ret = angie_append_set_signals_cmd(device, low, high);
-	if (ret == ERROR_OK)
-		angie_clear_queue(device);
+	if (ret != ERROR_OK)
+		return ret;
 
 	ret = angie_execute_queued_commands(device, LIBUSB_TIMEOUT_MS);
-	if (ret == ERROR_OK)
-		angie_clear_queue(device);
+	if (ret != ERROR_OK)
+		return ret;
 
-	return ret;
+	angie_clear_queue(device);
+
+	return ERROR_OK;
 }
 
 /**

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

Summary of changes:
 src/jtag/drivers/angie.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository