aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Qian <openocd@versaloon.com>2014-09-16 21:10:13 +0800
committerSpencer Oliver <spen@spen-soft.co.uk>2014-09-29 20:06:20 +0000
commitb4f6338738ddd13a36922109347fc3d6fe0733c0 (patch)
treee505f71bce0247d0d05a3e2026ec46461b9ba6e3 /src
parent54ff07808fb4c2f1a6226a0dfa669a43dc88edad (diff)
vsllink: improve the performance when using swd
Versaloon firmware has been updated for reporting errors if fail on swd transactions. Change-Id: I49ac0ad034cc9ad83cc4e43953579811d1243063 Signed-off-by: Simon Qian <openocd@versaloon.com> Reviewed-on: http://openocd.zylin.com/2302 Reviewed-by: Fatih Aşıcı <fatih.asici@gmail.com> Tested-by: jenkins Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/jtag/drivers/vsllink.c54
1 files changed, 4 insertions, 50 deletions
diff --git a/src/jtag/drivers/vsllink.c b/src/jtag/drivers/vsllink.c
index fcac2882..844f6f27 100644
--- a/src/jtag/drivers/vsllink.c
+++ b/src/jtag/drivers/vsllink.c
@@ -97,7 +97,6 @@ static uint8_t *tdi_buffer;
static uint8_t *tdo_buffer;
static bool swd_mode;
-static int queued_retval;
static struct vsllink *vsllink_handle;
@@ -758,7 +757,6 @@ static int_least32_t vsllink_swd_frequency(struct adiv5_dap *dap,
LOG_DEBUG("SWD delay: %d, retry count: %d", delay, retry_count);
versaloon_interface.adaptors.swd.config(0, 2, retry_count, delay);
- queued_retval = versaloon_interface.adaptors.peripheral_commit();
}
return hz;
@@ -788,68 +786,24 @@ static int vsllink_swd_switch_seq(struct adiv5_dap *dap,
return ERROR_FAIL;
}
- return versaloon_interface.adaptors.peripheral_commit();
+ return ERROR_OK;
}
static void vsllink_swd_read_reg(struct adiv5_dap *dap, uint8_t cmd,
uint32_t *value)
{
- if (queued_retval != ERROR_OK)
- return;
-
- int retval;
- uint32_t val = 0;
- uint8_t ack;
-
- versaloon_interface.adaptors.swd.transact(0, cmd, &val, &ack);
- retval = versaloon_interface.adaptors.peripheral_commit();
-
- if (retval != ERROR_OK) {
- queued_retval = ERROR_FAIL;
- return;
- }
-
- if (ack != 0x01) {
- queued_retval = ack;
- return;
- }
-
- if (value)
- *value = val;
-
- queued_retval = retval;
+ versaloon_interface.adaptors.swd.transact(0, cmd, value, NULL);
}
static void vsllink_swd_write_reg(struct adiv5_dap *dap, uint8_t cmd,
uint32_t value)
{
- if (queued_retval != ERROR_OK)
- return;
-
- int retval;
- uint8_t ack;
-
- versaloon_interface.adaptors.swd.transact(0, cmd, &value, &ack);
- retval = versaloon_interface.adaptors.peripheral_commit();
-
- if (retval != ERROR_OK) {
- queued_retval = ERROR_FAIL;
- return;
- }
-
- if (ack != 0x01) {
- queued_retval = ack;
- return;
- }
-
- queued_retval = retval;
+ versaloon_interface.adaptors.swd.transact(0, cmd, &value, NULL);
}
static int vsllink_swd_run_queue(struct adiv5_dap *dap)
{
- int retval = queued_retval;
- queued_retval = ERROR_OK;
- return retval;
+ return versaloon_interface.adaptors.peripheral_commit();
}
/****************************************************************************