X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Flibusb0_common.h;h=baa9e3c5a91e3e103be127451e1a418ee7157160;hb=e72b2601e71f49af10f72c4bb6220ee2061ef173;hp=38ff8cbaf176707876e23cada20900abc3ba7fbf;hpb=700e7605fe63571f6b912ce994c2f1eb1fd4fe92;p=openocd.git
diff --git a/src/jtag/drivers/libusb0_common.h b/src/jtag/drivers/libusb0_common.h
index 38ff8cbaf1..baa9e3c5a9 100644
--- a/src/jtag/drivers/libusb0_common.h
+++ b/src/jtag/drivers/libusb0_common.h
@@ -14,13 +14,11 @@
* GNU General Public License for more details. *
* *
* 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. *
+ * along with this program. If not, see . *
***************************************************************************/
-#ifndef JTAG_LIBUSB_COMMON_H
-#define JTAG_LIBUSB_COMMON_H
+#ifndef OPENOCD_JTAG_DRIVERS_LIBUSB0_COMMON_H
+#define OPENOCD_JTAG_DRIVERS_LIBUSB0_COMMON_H
#include
@@ -47,7 +45,14 @@ static inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh,
return usb_claim_interface(devh, iface);
};
+static inline int jtag_libusb_release_interface(jtag_libusb_device_handle *devh,
+ int iface)
+{
+ return usb_release_interface(devh, iface);
+}
+
int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
+ 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,
@@ -59,8 +64,10 @@ int jtag_libusb_bulk_read(struct jtag_libusb_device_handle *dev, int ep,
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,
+int jtag_libusb_choose_interface(struct jtag_libusb_device_handle *devh,
unsigned int *usb_read_ep,
- unsigned int *usb_write_ep);
+ unsigned int *usb_write_ep,
+ int bclass, int subclass, int protocol, int trans_type);
+int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid);
-#endif /* JTAG_USB_COMMON_H */
+#endif /* OPENOCD_JTAG_DRIVERS_LIBUSB0_COMMON_H */