[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-158-gd3a859cc4

[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  d3a859cc448441a0220287bfeecd0fab72cb31ca (commit)
      from  d7558e2ed67000afc2fa344e3acf67899fc3cebf (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 d3a859cc448441a0220287bfeecd0fab72cb31ca
Author: Antonio Borneo <bor...@gm...>
Date:   Sun May 16 01:43:44 2021 +0200

    cmsis_dap: fix build on macOS
    
    Compile fails with error:
            src/jtag/drivers/cmsis_dap.c:683:28: error: format specifies type
                'unsigned char' but the argument has type 'int' [-Werror,-Wformat]
                                     " received 0x%" PRIx8, CMD_DAP_TFER, resp[0]);
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~
    
    Fix the format specifier.
    
    Change-Id: I0a5a1a35452d634019989d14d849501fb8a7e93a
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6255
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index 26e576b8e..927b33bd7 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -679,8 +679,8 @@ static void cmsis_dap_swd_read_process(struct cmsis_dap *dap, int timeout_ms)
 
 	uint8_t *resp = dap->response;
 	if (resp[0] != CMD_DAP_TFER) {
-		LOG_ERROR("CMSIS-DAP command mismatch. Expected 0x%" PRIx8
-			 " received 0x%" PRIx8, CMD_DAP_TFER, resp[0]);
+		LOG_ERROR("CMSIS-DAP command mismatch. Expected 0x%x received 0x%" PRIx8,
+			CMD_DAP_TFER, resp[0]);
 		queued_retval = ERROR_FAIL;
 		goto skip;
 	}

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

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


hooks/post-receive
-- 
Main OpenOCD repository