diff options
| author | Szymon Modzelewski <szmodzelewski@gmail.com> | 2012-02-21 13:44:00 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-29 14:39:15 +0000 |
| commit | c59a4419fcc5568d59fbaee775132f91cb7fd26b (patch) | |
| tree | 91ddcb2c14fb20f608b2a7e08ca52aae33e55cc5 | |
| parent | 3ddb3b3c3d7a6a5764590a7df65e6c71ff924c0b (diff) | |
| download | riscv-openocd-c59a4419fcc5568d59fbaee775132f91cb7fd26b.zip riscv-openocd-c59a4419fcc5568d59fbaee775132f91cb7fd26b.tar.gz riscv-openocd-c59a4419fcc5568d59fbaee775132f91cb7fd26b.tar.bz2 | |
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>
| -rw-r--r-- | src/jtag/drivers/stlink_usb.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c index f7ad7c0..e3c005e 100644 --- a/src/jtag/drivers/stlink_usb.c +++ b/src/jtag/drivers/stlink_usb.c @@ -369,6 +369,13 @@ static int stlink_usb_recv(void *handle, const uint8_t *cmd, int cmdsize, uint8_ } /** */ +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) { struct stlink_usb_handle_s *h; @@ -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; |