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

stlink: simplify mem R/W with SWIM 

Thanks to API separation between SWIM and the other transports, we
can easily split the memory read/write for SWIM from the rest of
the code.
While there, use the macro STLINK_DATA_SIZE as size of data chunks
that can be read/write in SWIM. This was not implemented before.

Change-Id: I7d913c92539007e4d914480bacc0126a8f0e9705
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5531
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2020-02-04 12:53:54 +01:00
parent ffe6bc8220
commit 72f67790cf
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/jtag/drivers/stlink_usb.c
View File

@ -2322,11 +2322,6 @@ static int stlink_usb_read_mem(void *handle, uint32_t addr, uint32_t size,
if (count < bytes_remaining)
bytes_remaining = count;
if (h->st_mode == STLINK_MODE_DEBUG_SWIM) {
retval = stlink_swim_readbytes(handle, addr, bytes_remaining, buffer);
if (retval != ERROR_OK)
return retval;
} else
/*
* all stlink support 8/32bit memory read/writes and only from
* stlink V2J26 there is support for 16 bit memory read/write.
@ -2407,11 +2402,6 @@ static int stlink_usb_write_mem(void *handle, uint32_t addr, uint32_t size,
if (count < bytes_remaining)
bytes_remaining = count;
if (h->st_mode == STLINK_MODE_DEBUG_SWIM) {
retval = stlink_swim_writebytes(handle, addr, bytes_remaining, buffer);
if (retval != ERROR_OK)
return retval;
} else
/*
* all stlink support 8/32bit memory read/writes and only from
* stlink V2J26 there is support for 16 bit memory read/write.
@ -3552,13 +3542,47 @@ static int stlink_swim_op_srst(void)
static int stlink_swim_op_read_mem(uint32_t addr, uint32_t size,
uint32_t count, uint8_t *buffer)
{
return stlink_usb_read_mem(stlink_dap_handle, addr, size, count, buffer);
int retval;
uint32_t bytes_remaining;
LOG_DEBUG_IO("read at 0x%08x len %d*0x%08x", addr, size, count);
count *= size;
while (count) {
bytes_remaining = (count > STLINK_DATA_SIZE) ? STLINK_DATA_SIZE : count;
retval = stlink_swim_readbytes(stlink_dap_handle, addr, bytes_remaining, buffer);
if (retval != ERROR_OK)
return retval;
buffer += bytes_remaining;
addr += bytes_remaining;
count -= bytes_remaining;
}
return ERROR_OK;
}
static int stlink_swim_op_write_mem(uint32_t addr, uint32_t size,
uint32_t count, const uint8_t *buffer)
{
return stlink_usb_write_mem(stlink_dap_handle, addr, size, count, buffer);
int retval;
uint32_t bytes_remaining;
LOG_DEBUG_IO("write at 0x%08x len %d*0x%08x", addr, size, count);
count *= size;
while (count) {
bytes_remaining = (count > STLINK_DATA_SIZE) ? STLINK_DATA_SIZE : count;
retval = stlink_swim_writebytes(stlink_dap_handle, addr, bytes_remaining, buffer);
if (retval != ERROR_OK)
return retval;
buffer += bytes_remaining;
addr += bytes_remaining;
count -= bytes_remaining;
}
return ERROR_OK;
}
static int stlink_swim_op_reconnect(void)