X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Flibusb1_common.h;h=4ef6bf730d0faf14c4a62cd259f49f1ea6ebf85a;hb=355f4cadbbf10c75cf05fb1a82bf918b3ab65c55;hp=2cff3f09a9ba99f9b5d80b3921edbcb1814e2a6c;hpb=3ed7e793c82840d5be88be4c052d3785bd06d870;p=openocd.git

diff --git a/src/jtag/drivers/libusb1_common.h b/src/jtag/drivers/libusb1_common.h
index 2cff3f09a9..4ef6bf730d 100644
--- a/src/jtag/drivers/libusb1_common.h
+++ b/src/jtag/drivers/libusb1_common.h
@@ -16,14 +16,13 @@
  *   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.           *
  ***************************************************************************/
 
 #ifndef JTAG_LIBUSB_COMMON_H
 #define JTAG_LIBUSB_COMMON_H
 
-#include <helper/types.h>
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
 
 #define jtag_libusb_device			libusb_device
 #define jtag_libusb_device_handle		libusb_device_handle
@@ -37,22 +36,47 @@
 #define jtag_libusb_get_device(devh)		libusb_get_device(devh)
 
 static inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh,
-				       int iface)
+		int iface)
 {
 	return libusb_claim_interface(devh, iface);
 };
 
+static inline int jtag_libusb_release_interface(jtag_libusb_device_handle *devh,
+		int iface)
+{
+	return libusb_release_interface(devh, iface);
+}
+
 int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
-		     struct jtag_libusb_device_handle **out);
+		const char *serial,
+		struct jtag_libusb_device_handle **out);
 void jtag_libusb_close(jtag_libusb_device_handle *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 jtag_libusb_bulk_write(struct jtag_libusb_device_handle *dev, int ep,
-			   char *bytes,	int size, int timeout);
+		char *bytes,	int size, int timeout);
 int jtag_libusb_bulk_read(struct jtag_libusb_device_handle *dev, int ep,
-			  char *bytes, int size, int timeout);
+		char *bytes, int size, int timeout);
 int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
-				  int configuration);
-int jtag_libusb_get_endpoints(struct jtag_libusb_device *udev,
-			      unsigned int *usb_read_ep,
-			      unsigned int *usb_write_ep);
+		int configuration);
+/**
+ * Find the first interface optionally matching class, subclass and
+ * protocol and claim it.
+ * @param devh _libusb_ device handle.
+ * @param usb_read_ep A pointer to a variable where the _IN_ endpoint
+ *	number will be stored.
+ * @param usb_write_ep A pointer to a variable where the _OUT_ endpoint
+ *	number will be stored.
+ * @param bclass `bInterfaceClass` to match, or -1 to ignore this field.
+ * @param subclass `bInterfaceSubClass` to match, or -1 to ignore this field.
+ * @param protocol `bInterfaceProtocol` to match, or -1 to ignore this field.
+ * @returns Returns ERROR_OK on success, ERROR_FAIL otherwise.
+ */
+int jtag_libusb_choose_interface(struct jtag_libusb_device_handle *devh,
+		unsigned int *usb_read_ep,
+		unsigned int *usb_write_ep,
+		int bclass, int subclass, int protocol);
+int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid);
 
 #endif /* JTAG_USB_COMMON_H */