libusb: require pkg-config support

[openocd] / src / jtag / drivers / libusb0_common.c

diff --git a/src/jtag/drivers/libusb0_common.c b/src/jtag/drivers/libusb0_common.c
index 8ed60df942db9326082d1b31ead667770f51992d..32111195a9e220a1d9dd26aaad1b367cf8f31ca1 100644 (file)
--- a/src/jtag/drivers/libusb0_common.c
+++ b/src/jtag/drivers/libusb0_common.c
@@ -16,7 +16,7 @@
  *   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.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -28,7 +28,7 @@
 static bool jtag_libusb_match(struct jtag_libusb_device *dev,
                const uint16_t vids[], const uint16_t pids[])
 {
-       for (unsigned i = 0; vids[i] && pids[i]; i++) {
+       for (unsigned i = 0; vids[i]; i++) {
                if (dev->descriptor.idVendor == vids[i] &&
                        dev->descriptor.idProduct == pids[i]) {
                        return true;
@@ -48,7 +48,7 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
        struct usb_bus *busses = usb_get_busses();
        for (struct usb_bus *bus = busses; bus; bus = bus->next) {
                for (struct usb_device *dev = bus->devices;
-                    dev; dev = dev->next) {
+                               dev; dev = dev->next) {
                        if (!jtag_libusb_match(dev, vids, pids))
                                continue;
 
@@ -64,23 +64,38 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
 void jtag_libusb_close(jtag_libusb_device_handle *dev)
 {
        /* Close device */
-       jtag_libusb_close(dev);
+       usb_close(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 transferred = 0;
+
+       transferred = usb_control_msg(dev, requestType, request, wValue, wIndex,
+                               bytes, size, timeout);
+
+       if (transferred < 0)
+               transferred = 0;
+
+       return transferred;
 }
 
 int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
-                                               int size, int timeout)
+               int size, int timeout)
 {
        return usb_bulk_write(dev, ep, bytes, size, timeout);
 }
 
 int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
-                                          int size, int timeout)
+               int size, int timeout)
 {
        return usb_bulk_read(dev, ep, bytes, size, timeout);
 }
 
 int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
-                                 int configuration)
+               int configuration)
 {
        struct jtag_libusb_device *udev = jtag_libusb_get_device(devh);
 
@@ -89,8 +104,8 @@ int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
 }
 
 int jtag_libusb_get_endpoints(struct jtag_libusb_device *udev,
-                                                  unsigned int *usb_read_ep,
-                                                  unsigned int *usb_write_ep)
+               unsigned int *usb_read_ep,
+               unsigned int *usb_write_ep)
 {
        struct usb_interface *iface = udev->config->interface;
        struct usb_interface_descriptor *desc = iface->altsetting;