mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-03 23:47:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

libusb: fix compile and skip resetting device on freebsd

Browse Source
This commit is contained in:
Matthias Ringwald 2019-05-11 22:25:24 +02:00
parent 766df38f0f
commit 410cddbe55
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platform/libusb/hci_transport_h2_libusb.c
View File

@ -718,8 +718,8 @@ static int prepare_device(libusb_device_handle * aHandle){
int r;
int kernel_driver_detached = 0;
// Detach OS driver (not possible for OS X and WIN32)
#if !defined(__APPLE__) && !defined(_WIN32)
// Detach OS driver (not possible for OS X, FreeBSD, and WIN32)
#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__FreeBSD__)
r = libusb_kernel_driver_active(aHandle, 0);
if (r < 0) {
log_error("libusb_kernel_driver_active error %d", r);
@ -790,13 +790,15 @@ static libusb_device_handle * try_open_device(libusb_device * device){
log_info("libusb open %d, handle %p", r, dev_handle);
// reset device
// reset device (Not currently possible under FreeBSD 11.x/12.x due to usb framework)
#if !defined(__FreeBSD__)
r = libusb_reset_device(dev_handle);
if (r < 0) {
log_error("libusb_reset_device failed!");
libusb_close(dev_handle);
return NULL;
}
#endif
return dev_handle;
}
@ -1107,11 +1109,13 @@ static int usb_open(void){
}
#if 0
// Check for pollfds functionality
doing_pollfds = libusb_pollfds_handle_timeouts(NULL);
// NOTE: using pollfds doesn't work on Linux, so it is disable until further investigation here
#else
// NOTE: using pollfds doesn't work on Linux, so it is disable until further investigation
doing_pollfds = 0;
#endif
if (doing_pollfds) {
log_info("Async using pollfds:");