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

esp32/freertos: don't create thread for BTstack. make run_loop_execute block - same as all other ports

Browse Source
This commit is contained in:
Matthias Ringwald 2017-07-14 11:28:02 +02:00
parent ac7408dfb0
commit 4a76e901eb
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/freertos/btstack_run_loop_freertos.c
View File

@ -170,9 +170,7 @@ void btstack_run_loop_freertos_execute_code_on_main_thread_from_isr(void (*fn)(v
/**
* Execute run_loop
*/
static void btstack_run_loop_freertos_task(void *pvParameter){
UNUSED(pvParameter);
static void btstack_run_loop_freertos_execute(void) {
log_debug("RL: execute");
#ifdef HAVE_FREERTOS_TASK_NOTIFICATIONS
@ -228,12 +226,6 @@ static void btstack_run_loop_freertos_task(void *pvParameter){
}
}
static void btstack_run_loop_freertos_execute(void) {
// use dedicated task, might not be needed in all cases
xTaskCreate(&btstack_run_loop_freertos_task, "btstack_task", 3072, NULL, 5, NULL);
// btstack_run_loop_freertos_task(NULL);
}
static void btstack_run_loop_freertos_add_data_source(btstack_data_source_t *ds){
btstack_linked_list_add(&data_sources, (btstack_linked_item_t *) ds);
}

28
port/esp32/template/components/btstack/main.c
View File

@ -287,7 +287,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
switch(hci_event_packet_get_type(packet)){
case BTSTACK_EVENT_STATE:
if (btstack_event_state_get_state(packet) != HCI_STATE_WORKING) return;
printf("BTstack up and running.\n");
printf("BTstack: up and running.\n");
break;
case HCI_EVENT_COMMAND_COMPLETE:
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_read_local_version_information)){
@ -299,7 +299,12 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
}
}
static void btstack_setup(void){
extern int btstack_main(int argc, const char * argv[]);
// main
int app_main(void){
printf("BTstack: setup\n");
// enable packet logger
// hci_dump_open(NULL, HCI_DUMP_STDOUT);
@ -315,27 +320,10 @@ static void btstack_setup(void){
// inform about BTstack state
hci_event_callback_registration.callback = &packet_handler;
hci_add_event_handler(&hci_event_callback_registration);
}
extern int btstack_main(int argc, const char * argv[]);
// main
int app_main(void){
printf("btstack_task start\n");
printf("-------------- btstack_setup\n");
btstack_setup();
printf("-------------- btstack_setup end\n");
printf("-------------- btstack_main\n");
btstack_main(0, NULL);
printf("-------------- btstack_main end\n");
// printf("Entering btstack run loop!\n");
// btstack_run_loop_execute();
// printf("Run loop exited...this is unexpected\n");
printf("BTstack: execute run loop\n");
btstack_run_loop_execute();
return 0;
}