static bool jtag_libusb_match(struct jtag_libusb_device *dev,
const uint16_t vids[], const uint16_t pids[])
{
- for (unsigned i = 0; vids[i] && pids[i]; i++) {
+ for (unsigned i = 0; vids[i]; i++) {
if (dev->descriptor.idVendor == vids[i] &&
dev->descriptor.idProduct == pids[i]) {
return true;
struct usb_bus *busses = usb_get_busses();
for (struct usb_bus *bus = busses; bus; bus = bus->next) {
for (struct usb_device *dev = bus->devices;
- dev; dev = dev->next) {
+ dev; dev = dev->next) {
if (!jtag_libusb_match(dev, vids, pids))
continue;
void jtag_libusb_close(jtag_libusb_device_handle *dev)
{
/* Close device */
- jtag_libusb_close(dev);
+ usb_close(dev);
+}
+
+int jtag_libusb_control_transfer(jtag_libusb_device_handle *dev, uint8_t requestType,
+ uint8_t request, uint16_t wValue, uint16_t wIndex, char *bytes,
+ uint16_t size, unsigned int timeout)
+{
+ int transferred = 0;
+
+ transferred = usb_control_msg(dev, requestType, request, wValue, wIndex,
+ bytes, size, timeout);
+
+ if (transferred < 0)
+ transferred = 0;
+
+ return transferred;
}
int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
- int size, int timeout)
+ int size, int timeout)
{
return usb_bulk_write(dev, ep, bytes, size, timeout);
}
int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
- int size, int timeout)
+ int size, int timeout)
{
return usb_bulk_read(dev, ep, bytes, size, timeout);
}
int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
- int configuration)
+ int configuration)
{
struct jtag_libusb_device *udev = jtag_libusb_get_device(devh);
}
int jtag_libusb_get_endpoints(struct jtag_libusb_device *udev,
- unsigned int *usb_read_ep,
- unsigned int *usb_write_ep)
+ unsigned int *usb_read_ep,
+ unsigned int *usb_write_ep)
{
struct usb_interface *iface = udev->config->interface;
struct usb_interface_descriptor *desc = iface->altsetting;