interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Simon Qian 2014-09-16 21:10:13 +08:00 committed by Spencer Oliver
parent 54ff07808f
commit b4f6338738
1 changed files with 4 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/jtag/drivers/vsllink.c
View File

@ -97,7 +97,6 @@ static uint8_t *tdi_buffer;
static uint8_t *tdo_buffer; static uint8_t *tdo_buffer;
static bool swd_mode; static bool swd_mode;
static int queued_retval;
static struct vsllink *vsllink_handle; 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); LOG_DEBUG("SWD delay: %d, retry count: %d", delay, retry_count);
versaloon_interface.adaptors.swd.config(0, 2, retry_count, delay); versaloon_interface.adaptors.swd.config(0, 2, retry_count, delay);
queued_retval = versaloon_interface.adaptors.peripheral_commit();
} }
return hz; return hz;
@ -788,68 +786,24 @@ static int vsllink_swd_switch_seq(struct adiv5_dap *dap,
return ERROR_FAIL; 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, static void vsllink_swd_read_reg(struct adiv5_dap *dap, uint8_t cmd,
uint32_t *value) uint32_t *value)
{ {
if (queued_retval != ERROR_OK) versaloon_interface.adaptors.swd.transact(0, cmd, value, NULL);
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;
} }
static void vsllink_swd_write_reg(struct adiv5_dap *dap, uint8_t cmd, static void vsllink_swd_write_reg(struct adiv5_dap *dap, uint8_t cmd,
uint32_t value) uint32_t value)
{ {
if (queued_retval != ERROR_OK) versaloon_interface.adaptors.swd.transact(0, cmd, &value, NULL);
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;
} }
static int vsllink_swd_run_queue(struct adiv5_dap *dap) static int vsllink_swd_run_queue(struct adiv5_dap *dap)
{ {
int retval = queued_retval; return versaloon_interface.adaptors.peripheral_commit();
queued_retval = ERROR_OK;
return retval;
} }
/**************************************************************************** /****************************************************************************