mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-01 13:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

hci_transport_h2_libusb: fix compile with USB_VENDOR_ID and USB_PRODUCT_ID

Browse Source
This commit is contained in:
Matthias Ringwald 2021-07-02 10:41:06 +02:00
parent 83dbe30303
commit 9ea49f801c
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
platform/libusb/hci_transport_h2_libusb.c
View File

@ -579,32 +579,6 @@ static void usb_process_ts(btstack_timer_source_t *timer) {
return; return;
} }
#ifndef HAVE_USB_VENDOR_ID_AND_PRODUCT_ID
// list of known devices, using VendorID/ProductID tuples
static const uint16_t known_bluetooth_devices[] = {
// BCM20702A0 - DeLOCK Bluetooth 4.0
0x0a5c, 0x21e8,
// BCM20702A0 - Asus BT400
0x0b05, 0x17cb,
// BCM20702B0 - Generic USB Detuned Class 1 @ 20 MHz
0x0a5c, 0x22be,
// nRF5x Zephyr USB HCI, e.g nRF52840-PCA10056
0x2fe3, 0x0100,
0x2fe3, 0x000b,
};
static int num_known_devices = sizeof(known_bluetooth_devices) / sizeof(uint16_t) / 2;
static int is_known_bt_device(uint16_t vendor_id, uint16_t product_id){
int i;
for (i=0; i<num_known_devices; i++){
if (known_bluetooth_devices[i*2] == vendor_id && known_bluetooth_devices[i*2+1] == product_id){
return 1;
}
}
return 0;
}
static int scan_for_bt_endpoints(libusb_device *dev) { static int scan_for_bt_endpoints(libusb_device *dev) {
int r; int r;
@ -671,6 +645,33 @@ static int scan_for_bt_endpoints(libusb_device *dev) {
return 0; return 0;
} }
#ifndef HAVE_USB_VENDOR_ID_AND_PRODUCT_ID
// list of known devices, using VendorID/ProductID tuples
static const uint16_t known_bluetooth_devices[] = {
// BCM20702A0 - DeLOCK Bluetooth 4.0
0x0a5c, 0x21e8,
// BCM20702A0 - Asus BT400
0x0b05, 0x17cb,
// BCM20702B0 - Generic USB Detuned Class 1 @ 20 MHz
0x0a5c, 0x22be,
// nRF5x Zephyr USB HCI, e.g nRF52840-PCA10056
0x2fe3, 0x0100,
0x2fe3, 0x000b,
};
static int num_known_devices = sizeof(known_bluetooth_devices) / sizeof(uint16_t) / 2;
static int is_known_bt_device(uint16_t vendor_id, uint16_t product_id){
int i;
for (i=0; i<num_known_devices; i++){
if (known_bluetooth_devices[i*2] == vendor_id && known_bluetooth_devices[i*2+1] == product_id){
return 1;
}
}
return 0;
}
// returns index of found device or -1 // returns index of found device or -1
static int scan_for_bt_device(libusb_device **devs, int start_index) { static int scan_for_bt_device(libusb_device **devs, int start_index) {
int i; int i;
@ -1022,7 +1023,7 @@ static int usb_open(void){
return -1; return -1;
} }
dev = libusb_get_device(aHandle); dev = libusb_get_device(handle);
r = scan_for_bt_endpoints(dev); r = scan_for_bt_endpoints(dev);
if (r < 0){ if (r < 0){
usb_close(); usb_close();