drivers: call adapter_get_required_serial() in jtag_libusb_open()

[openocd.git] / src / jtag / drivers / usb_blaster / ublast_access.h

diff --git a/src/jtag/drivers/usb_blaster/ublast_access.h b/src/jtag/drivers/usb_blaster/ublast_access.h
index 00349d2ed4af17c13cac8c120e1bc6b330028273..ada764c1c12da1e7709154838e9e56abf4e1d731 100644 (file)
--- a/src/jtag/drivers/usb_blaster/ublast_access.h
+++ b/src/jtag/drivers/usb_blaster/ublast_access.h
@@ -28,8 +28,6 @@
 #ifndef OPENOCD_JTAG_DRIVERS_USB_BLASTER_UBLAST_ACCESS_H
 #define OPENOCD_JTAG_DRIVERS_USB_BLASTER_UBLAST_ACCESS_H
 
-#include <libusb_common.h>
-
 /* Low level flags */
 #define COPY_TDO_BUFFER                (1 << 0)
 
@@ -38,8 +36,7 @@ struct ublast_lowlevel {
        uint16_t ublast_pid;
        uint16_t ublast_vid_uninit;
        uint16_t ublast_pid_uninit;
-       char *ublast_device_desc;
-       struct jtag_libusb_device_handle *libusb_dev;
+       struct libusb_device_handle *libusb_dev;
        char *firmware_path;
 
        int (*write)(struct ublast_lowlevel *low, uint8_t *buf, int size,
@@ -56,19 +53,16 @@ struct ublast_lowlevel {
 
 /**
  * ublast_register_ftdi - get a lowlevel USB Blaster driver
- * ublast_register_ftd2xx - get a lowlevel USB Blaster driver
  * ublast2_register_libusb - get a lowlevel USB Blaster II driver
  *
- * Get a lowlevel USB-Blaster driver. In the current implementation, there are 3
+ * Get a lowlevel USB-Blaster driver. In the current implementation, there are 2
  * possible lowlevel drivers :
- *  - one based on libftdi from ftdichip.com
- *  - one based on libftdxx, the free alternative
+ *  - one based on libftdi,
  *  - one based on libusb, specific to the USB-Blaster II
  *
  * Returns the lowlevel driver structure.
  */
 extern struct ublast_lowlevel *ublast_register_ftdi(void);
-extern struct ublast_lowlevel *ublast_register_ftd2xx(void);
 extern struct ublast_lowlevel *ublast2_register_libusb(void);
 
 #endif /* OPENOCD_JTAG_DRIVERS_USB_BLASTER_UBLAST_ACCESS_H */