arm_debug: Support multiple APs per DAP and remove DAP from armv7* structs

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

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 807bdba965350d80707f4613a9ea7dfd162dba3b..db211805243dfaf67a3e4ed82ca15e19a32d879d 100644 (file)
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -1853,9 +1853,8 @@ static void jlink_swd_queue_cmd(struct adiv5_dap *dap, uint8_t cmd,
                uint32_t *dst, uint32_t data)
 {
        uint8_t data_parity_trn[DIV_ROUND_UP(32 + 1, 8)];
-
-       if (tap_length + 46 + 8 + dap->memaccess_tck >= swd_buffer_size * 8 ||
-               pending_scan_results_length == MAX_PENDING_SCAN_RESULTS) {
+       if (tap_length + 46 + 8 + dap->ap[dap_ap_get_select(dap)].memaccess_tck >= sizeof(tdi_buffer) * 8 ||
+           pending_scan_results_length == MAX_PENDING_SCAN_RESULTS) {
                /* Not enough room in the queue. Run the queue. */
                queued_retval = jlink_swd_run_queue(dap);
        }
@@ -1890,7 +1889,7 @@ static void jlink_swd_queue_cmd(struct adiv5_dap *dap, uint8_t cmd,
 
        /* Insert idle cycles after AP accesses to avoid WAIT. */
        if (cmd & SWD_CMD_APnDP)
-               jlink_queue_data_out(NULL, dap->memaccess_tck);
+               jlink_queue_data_out(NULL, dap->ap[dap_ap_get_select(dap)].memaccess_tck);
 }
 
 static const struct swd_driver jlink_swd = {