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

hci: rework hci halting states, stop scans and advertisements

Browse Source 
# Conflicts:
#	src/hci.c
This commit is contained in:
Matthias Ringwald 2022-02-10 11:30:37 +01:00
parent 184dbe2ff5
commit 0c88d5ef91
2 changed files with 74 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/hci.c
View File

@ -4131,7 +4131,7 @@ static int hci_power_control_wake(void){
return 0; return 0;
} }
static void hci_power_transition_to_initializing(void){ static void hci_power_enter_initializing_state(void){
// set up state machine // set up state machine
hci_stack->num_cmd_packets = 1; // assume that one cmd can be sent hci_stack->num_cmd_packets = 1; // assume that one cmd can be sent
hci_stack->hci_packet_buffer_reserved = false; hci_stack->hci_packet_buffer_reserved = false;
@ -4139,10 +4139,13 @@ static void hci_power_transition_to_initializing(void){
hci_stack->substate = HCI_INIT_SEND_RESET; hci_stack->substate = HCI_INIT_SEND_RESET;
} }
static void hci_power_transition_to_halting(void){ static void hci_power_enter_halting_state(void){
#ifdef ENABLE_BLE
hci_whitelist_free();
#endif
// see hci_run // see hci_run
hci_stack->state = HCI_STATE_HALTING; hci_stack->state = HCI_STATE_HALTING;
hci_stack->substate = HCI_HALTING_DISCONNECT_ALL_TIMER; hci_stack->substate = HCI_HALTING_CLASSIC_STOP;
// setup watchdog timer for disconnect - only triggers if Controller does not respond anymore // setup watchdog timer for disconnect - only triggers if Controller does not respond anymore
btstack_run_loop_set_timer(&hci_stack->timeout, 1000); btstack_run_loop_set_timer(&hci_stack->timeout, 1000);
btstack_run_loop_set_timer_handler(&hci_stack->timeout, hci_halting_timeout_handler); btstack_run_loop_set_timer_handler(&hci_stack->timeout, hci_halting_timeout_handler);
@ -4159,7 +4162,7 @@ static int hci_power_control_state_off(HCI_POWER_MODE power_mode){
log_error("hci_power_control_on() error %d", err); log_error("hci_power_control_on() error %d", err);
return err; return err;
} }
hci_power_transition_to_initializing(); hci_power_enter_initializing_state();
break; break;
case HCI_POWER_OFF: case HCI_POWER_OFF:
// do nothing // do nothing
@ -4200,7 +4203,7 @@ static int hci_power_control_state_working(HCI_POWER_MODE power_mode) {
// do nothing // do nothing
break; break;
case HCI_POWER_OFF: case HCI_POWER_OFF:
hci_power_transition_to_halting(); hci_power_enter_halting_state();
break; break;
case HCI_POWER_SLEEP: case HCI_POWER_SLEEP:
// see hci_run // see hci_run
@ -4217,7 +4220,7 @@ static int hci_power_control_state_working(HCI_POWER_MODE power_mode) {
static int hci_power_control_state_halting(HCI_POWER_MODE power_mode) { static int hci_power_control_state_halting(HCI_POWER_MODE power_mode) {
switch (power_mode){ switch (power_mode){
case HCI_POWER_ON: case HCI_POWER_ON:
hci_power_transition_to_initializing(); hci_power_enter_initializing_state();
break; break;
case HCI_POWER_OFF: case HCI_POWER_OFF:
// do nothing // do nothing
@ -4237,10 +4240,10 @@ static int hci_power_control_state_halting(HCI_POWER_MODE power_mode) {
static int hci_power_control_state_falling_asleep(HCI_POWER_MODE power_mode) { static int hci_power_control_state_falling_asleep(HCI_POWER_MODE power_mode) {
switch (power_mode){ switch (power_mode){
case HCI_POWER_ON: case HCI_POWER_ON:
hci_power_transition_to_initializing(); hci_power_enter_initializing_state();
break; break;
case HCI_POWER_OFF: case HCI_POWER_OFF:
hci_power_transition_to_halting(); hci_power_enter_halting_state();
break; break;
case HCI_POWER_SLEEP: case HCI_POWER_SLEEP:
// do nothing // do nothing
@ -4258,10 +4261,10 @@ static int hci_power_control_state_sleeping(HCI_POWER_MODE power_mode) {
case HCI_POWER_ON: case HCI_POWER_ON:
err = hci_power_control_wake(); err = hci_power_control_wake();
if (err) return err; if (err) return err;
hci_power_transition_to_initializing(); hci_power_enter_initializing_state();
break; break;
case HCI_POWER_OFF: case HCI_POWER_OFF:
hci_power_transition_to_halting(); hci_power_enter_halting_state();
break; break;
case HCI_POWER_SLEEP: case HCI_POWER_SLEEP:
// do nothing // do nothing
@ -4320,14 +4323,54 @@ static void hci_halting_run(void) {
hci_connection_t *connection; hci_connection_t *connection;
switch (hci_stack->substate) { switch (hci_stack->substate) {
case HCI_HALTING_DISCONNECT_ALL_NO_TIMER: case HCI_HALTING_CLASSIC_STOP:
case HCI_HALTING_DISCONNECT_ALL_TIMER: #ifdef ENABLE_CLASSIC
if (hci_stack->connectable || hci_stack->discoverable){
if (hci_can_send_command_packet_now()){
hci_stack->substate = HCI_HALTING_LE_ADV_STOP;
hci_send_cmd(&hci_write_scan_enable, 0);
}
return;
}
#endif
/* fall through */
case HCI_HALTING_LE_ADV_STOP:
hci_stack->substate = HCI_HALTING_LE_ADV_STOP;
#ifdef ENABLE_BLE
#ifdef ENABLE_LE_PERIPHERAL
if ((hci_stack->le_advertisements_state & LE_ADVERTISEMENT_STATE_ACTIVE) != 0){
if (hci_can_send_command_packet_now()){
hci_send_cmd(&hci_le_set_advertise_enable, 0);
hci_stack->substate = HCI_HALTING_LE_SCAN_STOP;
}
return;
}
#endif
#endif
/* fall through */
case HCI_HALTING_LE_SCAN_STOP:
hci_stack->substate = HCI_HALTING_LE_SCAN_STOP;
#ifdef ENABLE_BLE #ifdef ENABLE_BLE
#ifdef ENABLE_LE_CENTRAL #ifdef ENABLE_LE_CENTRAL
hci_whitelist_free(); if (hci_stack->le_scanning_active){
if (hci_can_send_command_packet_now()){
hci_send_cmd(&hci_le_set_scan_enable, 0, 0);
hci_stack->substate = HCI_HALTING_DISCONNECT_ALL;
}
return;
}
#endif #endif
#endif #endif
/* fall through */
case HCI_HALTING_DISCONNECT_ALL:
hci_stack->substate = HCI_HALTING_DISCONNECT_ALL;
// close all open connections // close all open connections
connection = (hci_connection_t *) hci_stack->connections; connection = (hci_connection_t *) hci_stack->connections;
if (connection) { if (connection) {
@ -4347,17 +4390,15 @@ static void hci_halting_run(void) {
btstack_run_loop_remove_timer(&hci_stack->timeout); btstack_run_loop_remove_timer(&hci_stack->timeout);
if (hci_stack->substate == HCI_HALTING_DISCONNECT_ALL_TIMER) { hci_stack->substate = HCI_HALTING_READY_FOR_CLOSE;
// no connections left, wait a bit to assert that btstack_cyrpto isn't waiting for an HCI event
log_info("HCI_STATE_HALTING: wait 50 ms");
hci_stack->substate = HCI_HALTING_W4_TIMER;
btstack_run_loop_set_timer(&hci_stack->timeout, 50);
btstack_run_loop_set_timer_handler(&hci_stack->timeout, hci_halting_timeout_handler);
btstack_run_loop_add_timer(&hci_stack->timeout);
break;
}
/* fall through */ // no connections left, wait a bit to assert that btstack_cyrpto isn't waiting for an HCI event
log_info("HCI_STATE_HALTING: wait 50 ms");
hci_stack->substate = HCI_HALTING_W4_CLOSE_TIMER;
btstack_run_loop_set_timer(&hci_stack->timeout, 50);
btstack_run_loop_set_timer_handler(&hci_stack->timeout, hci_halting_timeout_handler);
btstack_run_loop_add_timer(&hci_stack->timeout);
break;
case HCI_HALTING_CLOSE: case HCI_HALTING_CLOSE:
// close left over connections (that had not been properly closed before) // close left over connections (that had not been properly closed before)
@ -4373,7 +4414,7 @@ static void hci_halting_run(void) {
log_info("HCI_STATE_HALTING, done"); log_info("HCI_STATE_HALTING, done");
break; break;
case HCI_HALTING_W4_TIMER: case HCI_HALTING_W4_CLOSE_TIMER:
// keep waiting // keep waiting
break; break;
@ -7701,9 +7742,8 @@ void gap_set_page_timeout(uint16_t page_timeout){
void hci_halting_defer(void){ void hci_halting_defer(void){
if (hci_stack->state != HCI_STATE_HALTING) return; if (hci_stack->state != HCI_STATE_HALTING) return;
switch (hci_stack->substate){ switch (hci_stack->substate){
case HCI_HALTING_DISCONNECT_ALL_NO_TIMER: case HCI_HALTING_READY_FOR_CLOSE:
case HCI_HALTING_CLOSE: hci_stack->substate = HCI_HALTING_DEFER_CLOSE;
hci_stack->substate = HCI_HALTING_DISCONNECT_ALL_TIMER;
break; break;
default: default:
break; break;

10
src/hci.h
View File

@ -779,9 +779,13 @@ typedef enum hci_init_state{
HCI_INIT_AFTER_SLEEP, HCI_INIT_AFTER_SLEEP,
HCI_HALTING_DISCONNECT_ALL_NO_TIMER, HCI_HALTING_CLASSIC_STOP,
HCI_HALTING_DISCONNECT_ALL_TIMER, HCI_HALTING_LE_ADV_STOP,
HCI_HALTING_W4_TIMER, HCI_HALTING_LE_SCAN_STOP,
HCI_HALTING_DISCONNECT_ALL,
HCI_HALTING_READY_FOR_CLOSE,
HCI_HALTING_DEFER_CLOSE,
HCI_HALTING_W4_CLOSE_TIMER,
HCI_HALTING_CLOSE, HCI_HALTING_CLOSE,
} hci_substate_t; } hci_substate_t;