drivers: libusb1_common code cleanup

[openocd.git] / src / jtag / drivers / libusb1_common.h

diff --git a/src/jtag/drivers/libusb1_common.h b/src/jtag/drivers/libusb1_common.h
index 34be691f530cb8170a1b674ccde3886015344068..b132e26ae6ca5a1b38882c139284e19bc2945ad9 100644 (file)
--- a/src/jtag/drivers/libusb1_common.h
+++ b/src/jtag/drivers/libusb1_common.h
@@ -22,41 +22,18 @@
 
 #include <libusb.h>
 
-#define jtag_libusb_device                     libusb_device
-#define jtag_libusb_device_handle              libusb_device_handle
-#define jtag_libusb_device_descriptor          libusb_device_descriptor
-#define jtag_libusb_interface                  libusb_interface
-#define jtag_libusb_interface_descriptor       libusb_interface_descriptor
-#define jtag_libusb_endpoint_descriptor                libusb_endpoint_descriptor
-#define jtag_libusb_config_descriptor          libusb_config_descriptor
-
-#define jtag_libusb_reset_device(dev)          libusb_reset_device(dev)
-#define jtag_libusb_get_device(devh)           libusb_get_device(devh)
-
-static inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh,
-               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[],
                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,
+               struct libusb_device_handle **out);
+void jtag_libusb_close(struct libusb_device_handle *dev);
+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);
-int jtag_libusb_bulk_write(struct jtag_libusb_device_handle *dev, int ep,
+int jtag_libusb_bulk_write(struct libusb_device_handle *dev, int ep,
                char *bytes, int size, int timeout, int *transferred);
-int jtag_libusb_bulk_read(struct jtag_libusb_device_handle *dev, int ep,
+int jtag_libusb_bulk_read(struct libusb_device_handle *dev, int ep,
                char *bytes, int size, int timeout, int *transferred);
-int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
+int jtag_libusb_set_configuration(struct libusb_device_handle *devh,
                int configuration);
 /**
  * Find the first interface optionally matching class, subclass and
@@ -72,10 +49,10 @@ int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
  * @param trans_type `bmAttributes Bits 0..1 Transfer type` 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,
+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);
-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);
 
 #endif /* OPENOCD_JTAG_DRIVERS_LIBUSB1_COMMON_H */