mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-24 15:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix builds: libusb cmake, tool/metrics, test/mesh

Browse Source
This commit is contained in:
Matthias Ringwald 2021-03-03 14:22:18 +01:00
parent 1182cb7ea8
commit f8da99a8ad
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
port/libusb/CMakeLists.txt
View File

@ -110,6 +110,9 @@ set (LWIP_PORT
set (SOURCES_LWIP ${LWIP_CORE_SRC} ${LWIP_IPV4_SRC} ${LWIP_NETIF_SRC} ${LWIP_HTTPD} ${LWIP_DHCPD} ${LWIP_PORT}) set (SOURCES_LWIP ${LWIP_CORE_SRC} ${LWIP_IPV4_SRC} ${LWIP_NETIF_SRC} ${LWIP_HTTPD} ${LWIP_DHCPD} ${LWIP_PORT})
file(GLOB SOURCES_SRC_OFF "../../src/hci_transport_*.c")
list(REMOVE_ITEM SOURCES_SRC ${SOURCES_SRC_OFF})
file(GLOB SOURCES_BLE_OFF "../../src/ble/le_device_db_memory.c") file(GLOB SOURCES_BLE_OFF "../../src/ble/le_device_db_memory.c")
list(REMOVE_ITEM SOURCES_BLE ${SOURCES_BLE_OFF}) list(REMOVE_ITEM SOURCES_BLE ${SOURCES_BLE_OFF})

2
test/mesh/Makefile
View File

@ -14,7 +14,7 @@ CORE += \
btstack_link_key_db_fs.c \ btstack_link_key_db_fs.c \
btstack_run_loop_posix.c \ btstack_run_loop_posix.c \
btstack_stdin_posix.c \ btstack_stdin_posix.c \
btstack_uart_block_posix_pty.c \ btstack_uart_posix_pty.c \
hci_transport_h2_libusb.c \ hci_transport_h2_libusb.c \
hci_transport_h4.c \ hci_transport_h4.c \
btstack_tlv_posix.c \ btstack_tlv_posix.c \

4
test/mesh/btstack_uart_block_posix_pty.c → test/mesh/btstack_uart_posix_pty.c
View File

@ -35,7 +35,7 @@
* *
*/ */
#define __BTSTACK_FILE__ "btstack_uart_block_posix.c" #define __BTSTACK_FILE__ "btstack_uart_posix.c"
/* /*
* btstack_uart_block_posix.c * btstack_uart_block_posix.c
@ -410,6 +410,6 @@ static const btstack_uart_block_t btstack_uart_posix = {
/* void (*set_wakeup_handler)(void (*handler)(void)); */ NULL, /* void (*set_wakeup_handler)(void (*handler)(void)); */ NULL,
}; };
const btstack_uart_block_t * btstack_uart_block_posix_instance(void){ const btstack_uart_block_t * btstack_uart_posix_instance(void){
return &btstack_uart_posix; return &btstack_uart_posix;
} }

4
test/mesh/main.c
View File

@ -212,8 +212,8 @@ int main(int argc, const char * argv[]){
const hci_transport_t * transport; const hci_transport_t * transport;
if (config.device_name){ if (config.device_name){
// PTY // PTY
const btstack_uart_block_t * uart_driver = btstack_uart_block_posix_instance(); const btstack_uart_t * uart_driver = btstack_uart_posix_instance();
transport = hci_transport_h4_instance(uart_driver); transport = hci_transport_h4_instance_for_uart(uart_driver);
} else { } else {
// libusb // libusb
if (usb_path_len){ if (usb_path_len){

1
tool/metrics/btstack_config.h
View File

@ -28,6 +28,7 @@
// BTstack configuration. buffers, sizes, ... // BTstack configuration. buffers, sizes, ...
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4) #define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof BNEP header, avoid memcpy #define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof BNEP header, avoid memcpy
#define HCI_OUTGOING_PRE_BUFFER_SIZE 4
#define MAX_NR_LE_DEVICE_DB_ENTRIES 4 #define MAX_NR_LE_DEVICE_DB_ENTRIES 4