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

h5 ports: use btstack_uart_posix without slip wrapper

Browse Source
This commit is contained in:
Matthias Ringwald 2021-03-02 11:04:12 +01:00
parent 95b3bfd1d3
commit 79530e3778
6 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
port/posix-h5-bcm/Makefile
View File

@ -7,8 +7,7 @@ CORE += \
btstack_link_key_db_tlv.c \ btstack_link_key_db_tlv.c \
btstack_run_loop_posix.c \ btstack_run_loop_posix.c \
btstack_tlv_posix.c \ btstack_tlv_posix.c \
btstack_uart_block_posix.c \ btstack_uart_posix.c \
btstack_uart_slip_wrapper.c \
btstack_slip.c \ btstack_slip.c \
hci_transport_h5.c \ hci_transport_h5.c \
le_device_db_tlv.c \ le_device_db_tlv.c \

11
port/posix-h5-bcm/main.c
View File

@ -62,8 +62,6 @@
#include "btstack_run_loop_posix.h" #include "btstack_run_loop_posix.h"
#include "btstack_stdin.h" #include "btstack_stdin.h"
#include "btstack_uart.h" #include "btstack_uart.h"
#include "btstack_uart_block.h"
#include "btstack_uart_slip_wrapper.h"
#include "btstack_tlv_posix.h" #include "btstack_tlv_posix.h"
#include "classic/btstack_link_key_db_tlv.h" #include "classic/btstack_link_key_db_tlv.h"
#include "hci.h" #include "hci.h"
@ -165,19 +163,18 @@ int main(int argc, const char * argv[]){
btstack_chipset_bcm_set_device_name("BCM43430A1"); btstack_chipset_bcm_set_device_name("BCM43430A1");
// setup UART driver // setup UART driver
const btstack_uart_t * uart_block_driver = (const btstack_uart_t *) btstack_uart_block_posix_instance(); const btstack_uart_t * uart_driver = (const btstack_uart_t *) btstack_uart_posix_instance();
const btstack_uart_t * uart_slip_driver = btstack_uart_slip_wrapper_instance(uart_block_driver);
// extract UART config from transport config // extract UART config from transport config
uart_config.baudrate = transport_config.baudrate_init; uart_config.baudrate = transport_config.baudrate_init;
uart_config.flowcontrol = transport_config.flowcontrol; uart_config.flowcontrol = transport_config.flowcontrol;
uart_config.device_name = transport_config.device_name; uart_config.device_name = transport_config.device_name;
uart_block_driver->init(&uart_config); uart_driver->init(&uart_config);
// setup HCI (to be able to use bcm chipset driver) // setup HCI (to be able to use bcm chipset driver)
// init HCI // init HCI
const hci_transport_t * transport = hci_transport_h5_instance(uart_slip_driver); const hci_transport_t * transport = hci_transport_h5_instance(uart_driver);
hci_init(transport, (void*) &transport_config); hci_init(transport, (void*) &transport_config);
hci_set_chipset(btstack_chipset_bcm_instance()); hci_set_chipset(btstack_chipset_bcm_instance());
@ -195,7 +192,7 @@ int main(int argc, const char * argv[]){
printf("Phase 1: Download firmware\n"); printf("Phase 1: Download firmware\n");
// phase #2 start main app // phase #2 start main app
btstack_chipset_bcm_download_firmware(uart_block_driver, transport_config.baudrate_main, &phase2); btstack_chipset_bcm_download_firmware_with_uart(uart_driver, transport_config.baudrate_main, &phase2);
// go // go
btstack_run_loop_execute(); btstack_run_loop_execute();

3
port/posix-h5/Makefile
View File

@ -11,8 +11,7 @@ CORE += \
btstack_link_key_db_tlv.c \ btstack_link_key_db_tlv.c \
btstack_run_loop_posix.c \ btstack_run_loop_posix.c \
btstack_tlv_posix.c \ btstack_tlv_posix.c \
btstack_uart_block_posix.c \ btstack_uart_posix.c \
btstack_uart_slip_wrapper.c \
btstack_slip.c \ btstack_slip.c \
hci_transport_h5.c \ hci_transport_h5.c \
le_device_db_tlv.c \ le_device_db_tlv.c \

7
port/posix-h5/main.c
View File

@ -64,8 +64,6 @@
#include "btstack_stdin.h" #include "btstack_stdin.h"
#include "btstack_tlv_posix.h" #include "btstack_tlv_posix.h"
#include "btstack_uart.h" #include "btstack_uart.h"
#include "btstack_uart_block.h"
#include "btstack_uart_slip_wrapper.h"
#include "btstack_chipset_csr.h" #include "btstack_chipset_csr.h"
#include "btstack_chipset_cc256x.h" #include "btstack_chipset_cc256x.h"
@ -223,9 +221,8 @@ int main(int argc, const char * argv[]){
printf("H5 device: %s\n", config.device_name); printf("H5 device: %s\n", config.device_name);
// init HCI // init HCI
const btstack_uart_t * uart_block_driver = (const btstack_uart_t *) btstack_uart_block_posix_instance(); const btstack_uart_t * uart_driver = (const btstack_uart_t *) btstack_uart_posix_instance();
const btstack_uart_t * uart_slip_driver = btstack_uart_slip_wrapper_instance(uart_block_driver); const hci_transport_t * transport = hci_transport_h5_instance(uart_driver);
const hci_transport_t * transport = hci_transport_h5_instance(uart_slip_driver);
hci_init(transport, (void*) &config); hci_init(transport, (void*) &config);
// enable BCSP mode for CSR chipsets - auto detect might not work // enable BCSP mode for CSR chipsets - auto detect might not work

3
port/raspi/Makefile
View File

@ -8,8 +8,7 @@ CORE += \
btstack_link_key_db_tlv.c \ btstack_link_key_db_tlv.c \
btstack_run_loop_posix.c \ btstack_run_loop_posix.c \
btstack_tlv_posix.c \ btstack_tlv_posix.c \
btstack_uart_block_posix.c \ btstack_uart_posix.c \
btstack_uart_slip_wrapper.c \
btstack_slip.c \ btstack_slip.c \
hci_transport_h4.c \ hci_transport_h4.c \
hci_transport_h5.c \ hci_transport_h5.c \

11
port/raspi/main.c
View File

@ -371,21 +371,20 @@ int main(int argc, const char * argv[]){
btstack_chipset_bcm_set_hcd_folder_path("/lib/firmware/brcm"); btstack_chipset_bcm_set_hcd_folder_path("/lib/firmware/brcm");
// setup UART driver // setup UART driver
const btstack_uart_block_t * uart_block_driver = btstack_uart_block_posix_instance(); const btstack_uart_t * uart_driver = btstack_uart_posix_instance();
// extract UART config from transport config // extract UART config from transport config
uart_config.baudrate = transport_config.baudrate_init; uart_config.baudrate = transport_config.baudrate_init;
uart_config.flowcontrol = transport_config.flowcontrol; uart_config.flowcontrol = transport_config.flowcontrol;
uart_config.device_name = transport_config.device_name; uart_config.device_name = transport_config.device_name;
uart_block_driver->init(&uart_config); uart_driver->init(&uart_config);
// HW with FlowControl -> we can use regular h4 mode // HW with FlowControl -> we can use regular h4 mode
const hci_transport_t * transport; const hci_transport_t * transport;
if (transport_config.flowcontrol){ if (transport_config.flowcontrol){
transport = hci_transport_h4_instance(uart_block_driver); transport = hci_transport_h4_instance(uart_driver);
} else { } else {
const btstack_uart_t * uart_slip_driver = btstack_uart_slip_wrapper_instance(uart_block_driver); transport = hci_transport_h5_instance(uart_driver);
transport = hci_transport_h5_instance(uart_slip_driver);
} }
// setup HCI (to be able to use bcm chipset driver) // setup HCI (to be able to use bcm chipset driver)
@ -432,7 +431,7 @@ int main(int argc, const char * argv[]){
printf("Phase 1: Download firmware\n"); printf("Phase 1: Download firmware\n");
// phase #2 start main app // phase #2 start main app
btstack_chipset_bcm_download_firmware(uart_block_driver, transport_config.baudrate_main, &phase2); btstack_chipset_bcm_download_firmware(uart_driver, transport_config.baudrate_main, &phase2);
} }
// go // go