diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2012-10-09 16:47:16 +0200 |
|---|---|---|
| committer | Peter Stuge <peter@stuge.se> | 2012-10-28 01:33:57 +0000 |
| commit | 077d77140ca7aaff3f301c33f20f3831d0913c11 (patch) | |
| tree | ec4b644cc56b7bed4d6f001171501fe501f47767 | |
| parent | 442a684303b7cc0c33430490612e1bf70a4a3d63 (diff) | |
adi_v5_jtag.c: Avoid infinite recursion in jtagdp_transaction_endcheck()
Change-Id: I81163d9c2ff97ed768f8a3ac1505a8d2b5016b91
Signed-off-by: Peter Stuge <peter@stuge.se>
Reviewed-on: http://openocd.zylin.com/908
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
| -rw-r--r-- | src/target/adi_v5_jtag.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c index b6473b01..9f37bd55 100644 --- a/src/target/adi_v5_jtag.c +++ b/src/target/adi_v5_jtag.c @@ -254,7 +254,7 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap) DP_CTRL_STAT, DPAP_READ, 0, &ctrlstat); if (retval != ERROR_OK) return retval; - retval = dap_run(dap); + retval = jtag_execute_queue(); if (retval != ERROR_OK) return retval; dap->ack = dap->ack & 0x7; @@ -305,7 +305,7 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap) DP_CTRL_STAT, DPAP_READ, 0, &ctrlstat); if (retval != ERROR_OK) return retval; - retval = dap_run(dap); + retval = jtag_execute_queue(); if (retval != ERROR_OK) return retval; @@ -321,14 +321,14 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap) if (retval != ERROR_OK) return retval; - retval = dap_run(dap); + retval = jtag_execute_queue(); if (retval != ERROR_OK) return retval; LOG_ERROR("MEM_AP_CSW 0x%" PRIx32 ", MEM_AP_TAR 0x%" PRIx32, mem_ap_csw, mem_ap_tar); } - retval = dap_run(dap); + retval = jtag_execute_queue(); if (retval != ERROR_OK) return retval; return ERROR_JTAG_DEVICE_ERROR; |