projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jtag_libusb_bulk_read|write: return error code instead of size
[fw/openocd]
/
src
/
jtag
/
drivers
/
usb_blaster
/
ublast2_access_libusb.c
diff --git
a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
index d991733697b4951fb871771f99590f4c097d6e5e..fb1e4440a5a4aa89ba23daa05e38d6f18b8fad23 100644
(file)
--- a/
src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
+++ b/
src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
@@
-42,25
+42,34
@@
static int ublast2_libusb_read(struct ublast_lowlevel *low, uint8_t *buf,
unsigned size, uint32_t *bytes_read)
{
static int ublast2_libusb_read(struct ublast_lowlevel *low, uint8_t *buf,
unsigned size, uint32_t *bytes_read)
{
- *bytes_read = jtag_libusb_bulk_read(low->libusb_dev,
+ int ret, tmp = 0;
+
+ ret = jtag_libusb_bulk_read(low->libusb_dev,
USBBLASTER_EPIN | \
LIBUSB_ENDPOINT_IN,
(char *)buf,
size,
USBBLASTER_EPIN | \
LIBUSB_ENDPOINT_IN,
(char *)buf,
size,
- 100);
- return ERROR_OK;
+ 100, &tmp);
+ *bytes_read = tmp;
+
+ return ret;
}
static int ublast2_libusb_write(struct ublast_lowlevel *low, uint8_t *buf,
int size, uint32_t *bytes_written)
{
}
static int ublast2_libusb_write(struct ublast_lowlevel *low, uint8_t *buf,
int size, uint32_t *bytes_written)
{
- *bytes_written = jtag_libusb_bulk_write(low->libusb_dev,
+ int ret, tmp = 0;
+
+ ret = jtag_libusb_bulk_write(low->libusb_dev,
USBBLASTER_EPOUT | \
LIBUSB_ENDPOINT_OUT,
(char *)buf,
size,
USBBLASTER_EPOUT | \
LIBUSB_ENDPOINT_OUT,
(char *)buf,
size,
- 100);
- return ERROR_OK;
+ 100, &tmp);
+ *bytes_written = tmp;
+
+ return ret;
+
}
static int ublast2_write_firmware_section(struct jtag_libusb_device_handle *libusb_dev,
}
static int ublast2_write_firmware_section(struct jtag_libusb_device_handle *libusb_dev,