jtag/drivers/bitbang: use LOG_CUSTOM_LEVEL() macro for SWD

[openocd.git] / src / jtag / drivers / ftdi.c

diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index da5911ac99e696ab1e1927111a84af70be6e848c..58f83af59292896c9a07ab01a5761f82de2ec559 100644 (file)
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -625,14 +625,14 @@ static void ftdi_execute_command(struct jtag_command *cmd)
        }
 }
 
-static int ftdi_execute_queue(void)
+static int ftdi_execute_queue(struct jtag_command *cmd_queue)
 {
        /* blink, if the current layout has that feature */
        struct signal *led = find_signal_by_name("LED");
        if (led)
                ftdi_set_signal(led, '1');
 
-       for (struct jtag_command *cmd = jtag_command_queue; cmd; cmd = cmd->next) {
+       for (struct jtag_command *cmd = cmd_queue; cmd; cmd = cmd->next) {
                /* fill the write buffer with the desired command */
                ftdi_execute_command(cmd);
        }
@@ -1088,7 +1088,8 @@ static int ftdi_swd_run_queue(void)
                /* Devices do not reply to DP_TARGETSEL write cmd, ignore received ack */
                bool check_ack = swd_cmd_returns_ack(swd_cmd_queue[i].cmd);
 
-               LOG_DEBUG_IO("%s%s %s %s reg %X = %08"PRIx32,
+               LOG_CUSTOM_LEVEL((check_ack && ack != SWD_ACK_OK) ? LOG_LVL_DEBUG : LOG_LVL_DEBUG_IO,
+                               "%s%s %s %s reg %X = %08" PRIx32,
                                check_ack ? "" : "ack ignored ",
                                ack == SWD_ACK_OK ? "OK" : ack == SWD_ACK_WAIT ? "WAIT" : ack == SWD_ACK_FAULT ? "FAULT" : "JUNK",
                                swd_cmd_queue[i].cmd & SWD_CMD_APNDP ? "AP" : "DP",