X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Flibusb1_common.c;h=c4478cb9b1ac99b863b91df87b2e9d017699a73c;hp=1aae10d3bb4356a0716efb2501f790c3921fc984;hb=71ee5f6b5f3172901135640de4ca827b14747465;hpb=886ea0b9148381eefc148aeb4d7c6d63894e494b

diff --git a/src/jtag/drivers/libusb1_common.c b/src/jtag/drivers/libusb1_common.c
index 1aae10d3bb..c4478cb9b1 100644
--- a/src/jtag/drivers/libusb1_common.c
+++ b/src/jtag/drivers/libusb1_common.c
@@ -16,7 +16,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -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++) {
@@ -64,8 +62,11 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
 		/** Free the device list **/
 		libusb_free_device_list(devs, 1);
 
-		if (errCode < 0)
+		if (errCode) {
+			LOG_ERROR("libusb_open() failed with %s",
+				  libusb_error_name(errCode));
 			return errCode;
+		}
 		return 0;
 	}
 	return -ENODEV;
@@ -74,13 +75,28 @@ 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)
+		int size, int timeout)
 {
 	int transferred = 0;
 
@@ -90,7 +106,7 @@ int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
 }
 
 int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
-			  int size, int timeout)
+		int size, int timeout)
 {
 	int transferred = 0;
 
@@ -100,7 +116,7 @@ int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
 }
 
 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 retCode = -99;
@@ -116,8 +132,8 @@ int jtag_libusb_set_configuration(jtag_libusb_device_handle *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)
 {
 	const struct libusb_interface *inter;
 	const struct libusb_interface_descriptor *interdesc;