[PATCH]: 38061a19aa drivers/cmsis_dap, kitprog: use helper to derive err code from ack

[gerrit]

This is an automated email from Gerrit.

"Tomas Vanek <van...@fbl.cz>" just uploaded a new patch set to Gerrit, which 
you can find at https://review.openocd.org/c/openocd/+/8137

-- gerrit

commit 38061a19aa21eaaee734c6004aec19bb854fea9c
Author: Tomas Vanek <van...@fbl.cz>
Date:   Fri Feb 9 07:35:42 2024 +0100

    drivers/cmsis_dap, kitprog: use helper to derive err code from ack
    
    Unify the error codes returned by adapter drivers in the case
    of the received SWD ACK field differs from OK.
    
    Signed-off-by: Tomas Vanek <van...@fbl.cz>
    Change-Id: I29e478390b4b30408054a090ac6a7fac3415ae71

diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index caacc9b916..d4511b0ba8 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -944,7 +944,7 @@ static void cmsis_dap_swd_read_process(struct cmsis_dap 
*dap, enum cmsis_dap_blo
        if (ack != SWD_ACK_OK) {
                LOG_DEBUG("SWD ack not OK @ %d %s", transfer_count,
                          ack == SWD_ACK_WAIT ? "WAIT" : ack == SWD_ACK_FAULT ? 
"FAULT" : "JUNK");
-               queued_retval = ack == SWD_ACK_WAIT ? ERROR_WAIT : ERROR_FAIL;
+               queued_retval = swd_ack_to_error_code(ack);
                /* TODO: use results of transfers completed before the error 
occurred? */
                goto skip;
        }
diff --git a/src/jtag/drivers/kitprog.c b/src/jtag/drivers/kitprog.c
index c0d2adc100..98b0d16681 100644
--- a/src/jtag/drivers/kitprog.c
+++ b/src/jtag/drivers/kitprog.c
@@ -782,7 +782,7 @@ static int kitprog_swd_run_queue(void)
                        if (ack != SWD_ACK_OK || (buffer[read_index] & 0x08)) {
                                LOG_DEBUG("SWD ack not OK: %d %s", i,
                                          ack == SWD_ACK_WAIT ? "WAIT" : ack == 
SWD_ACK_FAULT ? "FAULT" : "JUNK");
-                               queued_retval = ack == SWD_ACK_WAIT ? 
ERROR_WAIT : ERROR_FAIL;
+                               queued_retval = swd_ack_to_error_code(ack);
                                break;
                        }
                        read_index++;

--