diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2014-08-15 19:30:47 +0400 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2014-09-08 20:23:15 +0000 |
| commit | 96549bf0121a7cff08885ddca22ab7a1c362ea24 (patch) | |
| tree | bb72f2da432b1132fe0e67818306cd8628497f47 | |
| parent | b171c7ab16e1cbad3ca2a6a2cb0a26a3da735424 (diff) | |
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>
| -rw-r--r-- | src/jtag/drivers/libusb0_common.c | 12 | ||||
| -rw-r--r-- | src/jtag/drivers/libusb1_common.c | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/jtag/drivers/libusb0_common.c b/src/jtag/drivers/libusb0_common.c index 4b3bde1e..16dd4ecb 100644 --- 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) { - 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 81e8ca88..99e0d482 100644 --- 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; - return 0; + return ERROR_OK; } - return -ENODEV; + return ERROR_FAIL; } |