Browse Source

stlink-v1: fix memory writes

implement stlink_usb_send and use it to fix stlink_usb_write_mem

using two calls to stlink_usb_recv is inappropriate since each
call issues a SG command on stlink-v1, resulting in errors

Change-Id: I24ef9f2dda284e041dc4a532b59968a77eebe702
Signed-off-by: Szymon Modzelewski <szmodzelewski@gmail.com>
Reviewed-on: http://openocd.zylin.com/498
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
tags/v0.6.0-rc1
Szymon Modzelewski 10 years ago
committed by Spencer Oliver
parent
commit
c59a4419fc
1 changed files with 9 additions and 12 deletions
  1. +9
    -12
      src/jtag/drivers/stlink_usb.c

+ 9
- 12
src/jtag/drivers/stlink_usb.c View File

@@ -368,6 +368,13 @@ static int stlink_usb_recv(void *handle, const uint8_t *cmd, int cmdsize, uint8_
return stlink_usb_xfer(handle, cmd, cmdsize, STLINK_RX_EP, rxbuf, rxsize);
}

/** */
static int stlink_usb_send(void *handle, const uint8_t *cmd, int cmdsize, uint8_t *txbuf,
int txsize)
{
return stlink_usb_xfer(handle, cmd, cmdsize, STLINK_TX_EP, txbuf, txsize);
}

/** */
static void stlink_usb_init_buffer(void *handle)
{
@@ -971,12 +978,7 @@ static int stlink_usb_write_mem8(void *handle, uint32_t addr, uint16_t len,
h_u32_to_le(h->txbuf + 2, addr);
h_u16_to_le(h->txbuf + 2 + 4, len);

res = stlink_usb_recv(handle, h->txbuf, STLINK_CMD_SIZE, 0, 0);

if (res != ERROR_OK)
return res;

res = stlink_usb_recv(handle, (uint8_t *) buffer, len, 0, 0);
res = stlink_usb_send(handle, h->txbuf, STLINK_CMD_SIZE, (uint8_t *) buffer, len);

if (res != ERROR_OK)
return res;
@@ -1034,12 +1036,7 @@ static int stlink_usb_write_mem32(void *handle, uint32_t addr, uint16_t len,
h_u32_to_le(h->txbuf + 2, addr);
h_u16_to_le(h->txbuf + 2 + 4, len);

res = stlink_usb_recv(handle, h->txbuf, STLINK_CMD_SIZE, 0, 0);

if (res != ERROR_OK)
return res;

res = stlink_usb_recv(handle, (uint8_t *) buffer, len, 0, 0);
res = stlink_usb_send(handle, h->txbuf, STLINK_CMD_SIZE, (uint8_t *) buffer, len);

if (res != ERROR_OK)
return res;


Loading…
Cancel
Save