zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
__archive__
Paul Fertser 2014-08-15 19:30:47 +04:00 committed by Andreas Fritiofson
parent b171c7ab16
commit 96549bf012
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jtag/drivers/libusb0_common.c
View File

@ -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;
}

4
src/jtag/drivers/libusb1_common.c
View File

@ -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;
}