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

use hci_initializing_next_state() instead of direct ++

Browse Source
This commit is contained in:
Matthias Ringwald 2015-03-29 22:58:02 +02:00
parent 5c3637275c
commit 55975f88a1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hci.c
View File

@ -811,6 +811,10 @@ void le_handle_advertisement_report(uint8_t *packet, int size){
} }
#endif #endif
static void hci_initializing_next_state(){
hci_stack->substate = (hci_init_state_t )( ((int) hci_stack->substate) + 1);
}
static void hci_initializing_event_handler(uint8_t * packet, uint16_t size){ static void hci_initializing_event_handler(uint8_t * packet, uint16_t size){
uint8_t command_completed = 0; uint8_t command_completed = 0;
if ((hci_stack->substate % 2) == 0) return; if ((hci_stack->substate % 2) == 0) return;
@ -843,7 +847,7 @@ static void hci_initializing_event_handler(uint8_t * packet, uint16_t size){
switch(hci_stack->substate >> 1){ switch(hci_stack->substate >> 1){
default: default:
hci_stack->substate++; hci_initializing_next_state();
break; break;
} }
} }
@ -993,7 +997,7 @@ static void hci_initializing_state_machine(){
default: default:
break; break;
} }
hci_stack->substate++; hci_initializing_next_state();
} }
// avoid huge local variables // avoid huge local variables
@ -1449,7 +1453,7 @@ static void event_handler(uint8_t *packet, int size){
if (hci_stack->state == HCI_STATE_FALLING_ASLEEP if (hci_stack->state == HCI_STATE_FALLING_ASLEEP
&& hci_stack->substate == HCI_INIT_W4_SEND_RESET && hci_stack->substate == HCI_INIT_W4_SEND_RESET
&& COMMAND_COMPLETE_EVENT(packet, hci_write_scan_enable)){ && COMMAND_COMPLETE_EVENT(packet, hci_write_scan_enable)){
hci_stack->substate++; hci_initializing_next_state();
} }
// notify upper stack // notify upper stack
@ -2175,7 +2179,7 @@ void hci_run(){
hci_send_cmd(&hci_write_scan_enable, hci_stack->connectable << 1); // drop inquiry scan but keep page scan hci_send_cmd(&hci_write_scan_enable, hci_stack->connectable << 1); // drop inquiry scan but keep page scan
// continue in next sub state // continue in next sub state
hci_stack->substate++; hci_initializing_next_state();
break; break;
} }
// fall through for ble-only chips // fall through for ble-only chips