X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Flibusb1_common.c;fp=src%2Fjtag%2Fdrivers%2Flibusb1_common.c;h=607b6d4aa907b14359c51c1537d7d0461f8b9633;hp=0d4bcbab68072ddf586b5aa188d14719fc7a9695;hb=93c6bf2cce5f23e37d4a1dd5136a40e74c69285c;hpb=8ce51b6a207e8cefdf5b6cb06d3c57d1cbef5a99

diff --git a/src/jtag/drivers/libusb1_common.c b/src/jtag/drivers/libusb1_common.c
index 0d4bcbab68..607b6d4aa9 100644
--- a/src/jtag/drivers/libusb1_common.c
+++ b/src/jtag/drivers/libusb1_common.c
@@ -125,12 +125,12 @@ static bool string_descriptor_equal(libusb_device_handle *device, uint8_t str_in
 
 int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
 		const char *serial,
-		struct jtag_libusb_device_handle **out)
+		struct libusb_device_handle **out)
 {
 	int cnt, idx, errCode;
 	int retval = ERROR_FAIL;
 	bool serial_mismatch = false;
-	struct jtag_libusb_device_handle *libusb_handle = NULL;
+	struct libusb_device_handle *libusb_handle = NULL;
 
 	if (libusb_init(&jtag_libusb_context) < 0)
 		return ERROR_FAIL;
@@ -180,7 +180,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
 	return retval;
 }
 
-void jtag_libusb_close(jtag_libusb_device_handle *dev)
+void jtag_libusb_close(struct libusb_device_handle *dev)
 {
 	/* Close device */
 	libusb_close(dev);
@@ -188,7 +188,7 @@ void jtag_libusb_close(jtag_libusb_device_handle *dev)
 	libusb_exit(jtag_libusb_context);
 }
 
-int jtag_libusb_control_transfer(jtag_libusb_device_handle *dev, uint8_t requestType,
+int jtag_libusb_control_transfer(struct libusb_device_handle *dev, uint8_t requestType,
 		uint8_t request, uint16_t wValue, uint16_t wIndex, char *bytes,
 		uint16_t size, unsigned int timeout)
 {
@@ -203,7 +203,7 @@ int jtag_libusb_control_transfer(jtag_libusb_device_handle *dev, uint8_t request
 	return transferred;
 }
 
-int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
+int jtag_libusb_bulk_write(struct libusb_device_handle *dev, int ep, char *bytes,
 			   int size, int timeout, int *transferred)
 {
 	int ret;
@@ -220,7 +220,7 @@ int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
 	return ERROR_OK;
 }
 
-int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
+int jtag_libusb_bulk_read(struct libusb_device_handle *dev, int ep, char *bytes,
 			  int size, int timeout, int *transferred)
 {
 	int ret;
@@ -237,10 +237,10 @@ int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
 	return ERROR_OK;
 }
 
-int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
+int jtag_libusb_set_configuration(struct libusb_device_handle *devh,
 		int configuration)
 {
-	struct jtag_libusb_device *udev = jtag_libusb_get_device(devh);
+	struct libusb_device *udev = libusb_get_device(devh);
 	int retCode = -99;
 
 	struct libusb_config_descriptor *config = NULL;
@@ -265,12 +265,12 @@ int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
 	return retCode;
 }
 
-int jtag_libusb_choose_interface(struct jtag_libusb_device_handle *devh,
+int jtag_libusb_choose_interface(struct libusb_device_handle *devh,
 		unsigned int *usb_read_ep,
 		unsigned int *usb_write_ep,
 		int bclass, int subclass, int protocol, int trans_type)
 {
-	struct jtag_libusb_device *udev = jtag_libusb_get_device(devh);
+	struct libusb_device *udev = libusb_get_device(devh);
 	const struct libusb_interface *inter;
 	const struct libusb_interface_descriptor *interdesc;
 	const struct libusb_endpoint_descriptor *epdesc;
@@ -317,7 +317,7 @@ int jtag_libusb_choose_interface(struct jtag_libusb_device_handle *devh,
 	return ERROR_FAIL;
 }
 
-int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid)
+int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid)
 {
 	struct libusb_device_descriptor dev_desc;