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

libusb: add new 0x000b pid of Zephyr HCI USB firmware, init sm_init(), disable SCO if there's only one interface

Browse Source
This commit is contained in:
Matthias Ringwald 2021-02-08 09:57:37 +01:00
parent 2d2d4d3cb1
commit f4ab45812f
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
platform/libusb/hci_transport_h2_libusb.c
View File

@ -590,6 +590,7 @@ static const uint16_t known_bt_devices[] = {
0x0a5c, 0x22be, 0x0a5c, 0x22be,
// Zephyr e.g nRF52840-PCA10056 // Zephyr e.g nRF52840-PCA10056
0x2fe3, 0x0100, 0x2fe3, 0x0100,
0x2fe3, 0x000b,
}; };
static int num_known_devices = sizeof(known_bt_devices) / sizeof(uint16_t) / 2; static int num_known_devices = sizeof(known_bt_devices) / sizeof(uint16_t) / 2;
@ -689,7 +690,6 @@ static int scan_for_bt_device(libusb_device **devs, int start_index) {
// The class code (bDeviceClass) is 0xE0 – Wireless Controller. // The class code (bDeviceClass) is 0xE0 – Wireless Controller.
// The SubClass code (bDeviceSubClass) is 0x01 – RF Controller. // The SubClass code (bDeviceSubClass) is 0x01 – RF Controller.
// The Protocol code (bDeviceProtocol) is 0x01 – Bluetooth programming. // The Protocol code (bDeviceProtocol) is 0x01 – Bluetooth programming.
// if (desc.bDeviceClass == 0xe0 && desc.bDeviceSubClass == 0x01 && desc.bDeviceProtocol == 0x01){
if (desc.bDeviceClass == 0xE0 && desc.bDeviceSubClass == 0x01 && desc.bDeviceProtocol == 0x01) { if (desc.bDeviceClass == 0xE0 && desc.bDeviceSubClass == 0x01 && desc.bDeviceProtocol == 0x01) {
return i; return i;
} }
@ -766,12 +766,21 @@ static int prepare_device(libusb_device_handle * aHandle){
} }
#ifdef ENABLE_SCO_OVER_HCI #ifdef ENABLE_SCO_OVER_HCI
log_info("claiming interface 1..."); // get endpoints from interface descriptor
r = libusb_claim_interface(aHandle, 1); struct libusb_config_descriptor *config_descriptor;
if (r < 0) { r = libusb_get_active_config_descriptor(device, &config_descriptor);
log_error("Error %d claiming interface 1: - disabling SCO over HCI", r); if (r >= 0){
} else { int num_interfaces = config_descriptor->bNumInterfaces;
sco_enabled = 1; if (num_interfaces > 1) {
r = libusb_claim_interface(aHandle, 1);
if (r < 0) {
log_error("Error %d claiming interface 1: - disabling SCO over HCI", r);
} else {
sco_enabled = 1;
}
} else {
log_info("Device has only on interface, disabling SCO over HCI");
}
} }
#endif #endif

5
port/libusb/main.c
View File

@ -97,8 +97,11 @@ static void local_version_information_handler(uint8_t * packet){
printf("- Manufacturer 0x%04x\n", manufacturer); printf("- Manufacturer 0x%04x\n", manufacturer);
switch (manufacturer){ switch (manufacturer){
case BLUETOOTH_COMPANY_ID_THE_LINUX_FOUNDATION: case BLUETOOTH_COMPANY_ID_THE_LINUX_FOUNDATION:
printf("Linux Foundation - assume Zephyr hci_usb example running on nRF52xx\n"); printf("- Linux Foundation - assume Zephyr hci_usb firmware running on nRF52xx\n");
// setup Zephyr chipset support
hci_set_chipset(btstack_chipset_zephyr_instance()); hci_set_chipset(btstack_chipset_zephyr_instance());
// sm required to setup static random Bluetooth address
sm_init();
break; break;
default: default:
break; break;