jtag/drivers/libusb0_common: fix FTBFS (libusb_device_descriptor error)

This struct and libusb_get_device_descriptor() method are not present
in libusb-0.1 API, so when libusb-1.0 is unavailable, this code breaks
the build. Fix by using the appropriate struct (which is apparently
filled automatically on device initialisation).

While at it, change return values for consistency with the callers.

Change-Id: I7d85ab9a70401a155a65122397008ae4d81382fe
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2252
Tested-by: jenkins
Reviewed-by: Austin Phillips <austin_phillips@hotmail.com>
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>

diff --git a/src/jtag/drivers/libusb0_common.c b/src/jtag/drivers/libusb0_common.c
index 4b3bde1ec0a6c67d36c4d3f9704e8e2e755191ca..16dd4ecba6323af6f119060cb77effd4eff9ab26 100644 (file)
--- a/src/jtag/drivers/libusb0_common.c
+++ b/src/jtag/drivers/libusb0_common.c
@@ -125,13 +125,9 @@ int jtag_libusb_get_endpoints(struct jtag_libusb_device *udev,
 
 int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid)
 {
 
 int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid)
 {

-       struct libusb_device_descriptor dev_desc;
+       if (!dev)
+               return ERROR_FAIL;

 
 

-       if (libusb_get_device_descriptor(dev, &dev_desc) == 0) {
-               *pid = dev_desc.idProduct;
-
-               return 0;
-       }
-
-       return -ENODEV;
+       *pid = dev->descriptor.idProduct;
+       return ERROR_OK;

 }
 }

diff --git a/src/jtag/drivers/libusb1_common.c b/src/jtag/drivers/libusb1_common.c
index 81e8ca888728b8b5bc202dbb4924baaa27a35baa..99e0d48268da8f8612e33b75a7eb0860559ed5be 100644 (file)
--- a/src/jtag/drivers/libusb1_common.c
+++ b/src/jtag/drivers/libusb1_common.c
@@ -174,8 +174,8 @@ int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid)
        if (libusb_get_device_descriptor(dev, &dev_desc) == 0) {
                *pid = dev_desc.idProduct;
 
        if (libusb_get_device_descriptor(dev, &dev_desc) == 0) {
                *pid = dev_desc.idProduct;
 

-               return 0;
+               return ERROR_OK;

        }
 
        }
 

-       return -ENODEV;
+       return ERROR_FAIL;

 }
 }