X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Flibusb1_common.c;h=888420ac2ab3690f7c3e704f3fd8c3f4075a838f;hp=dcca8d1c7d74696aec108ca4e0a0e2ba17647867;hb=305832c49dc5193720b0ed58d3707891c60b9aaa;hpb=de0130a0aad83c1ef692ee4d68ab996a8668424d

diff --git a/src/jtag/drivers/libusb1_common.c b/src/jtag/drivers/libusb1_common.c
index dcca8d1c7d..888420ac2a 100644
--- a/src/jtag/drivers/libusb1_common.c
+++ b/src/jtag/drivers/libusb1_common.c
@@ -33,7 +33,7 @@ static bool jtag_libusb_match(struct jtag_libusb_device *dev,
 {
 	struct libusb_device_descriptor dev_desc;
 
-	for (unsigned i = 0; vids[i] && pids[i]; i++) {
+	for (unsigned i = 0; vids[i]; i++) {
 		if (libusb_get_device_descriptor(dev, &dev_desc) == 0) {
 			if (dev_desc.idVendor == vids[i] &&
 				dev_desc.idProduct == pids[i])
@@ -51,8 +51,6 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
 	if (libusb_init(&jtag_libusb_context) < 0)
 		return -ENODEV;
 
-	libusb_set_debug(jtag_libusb_context, 3);
-
 	cnt = libusb_get_device_list(jtag_libusb_context, &devs);
 
 	for (idx = 0; idx < cnt; idx++) {
@@ -74,11 +72,26 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
 void jtag_libusb_close(jtag_libusb_device_handle *dev)
 {
 	/* Close device */
-	jtag_libusb_close(dev);
+	libusb_close(dev);
 
 	libusb_exit(jtag_libusb_context);
 }
 
+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 = libusb_control_transfer(dev, requestType, request, wValue, wIndex,
+				(unsigned char *)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)
 {