mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-28 06:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle CSR Warm Boot

Browse Source
This commit is contained in:
Matthias Ringwald 2015-03-31 12:43:57 +02:00
parent baf36f076c
commit e47e68c797
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/hci.c
View File

@ -819,6 +819,11 @@ static void hci_initialization_timeout_handler(timer_source_t * ds){
hci_stack->num_cmd_packets = 1;
hci_run();
break;
case HCI_INIT_W4_CUSTOM_INIT_CSR_WARM_BOOT:
log_info("Resend HCI Reset - CSR Warm Boot");
hci_stack->substate = HCI_INIT_SEND_RESET_CSR_WARM_BOOT;
hci_stack->num_cmd_packets = 1;
hci_run();
default:
break;
}
@ -842,6 +847,16 @@ static void hci_initializing_run(){
hci_stack->substate = HCI_INIT_W4_SEND_RESET;
hci_send_cmd(&hci_reset);
break;
case HCI_INIT_SEND_RESET_CSR_WARM_BOOT:
hci_state_reset();
// prepare reset if command complete not received in 100ms
run_loop_set_timer(&hci_stack->timeout, 100);
run_loop_set_timer_handler(&hci_stack->timeout, hci_initialization_timeout_handler);
run_loop_add_timer(&hci_stack->timeout);
// send command
hci_stack->substate = HCI_INIT_W4_CUSTOM_INIT_CSR_WARM_BOOT;
hci_send_cmd(&hci_reset);
break;
case HCI_INIT_SEND_BAUD_CHANGE:
hci_stack->control->baudrate_cmd(hci_stack->config, ((hci_uart_config_t *)hci_stack->config)->baudrate_main, hci_stack->hci_packet_buffer);
hci_stack->last_cmd_opcode = READ_BT_16(hci_stack->hci_packet_buffer, 0);
@ -864,7 +879,19 @@ static void hci_initializing_run(){
int size = 3 + hci_stack->hci_packet_buffer[2];
hci_stack->last_cmd_opcode = READ_BT_16(hci_stack->hci_packet_buffer, 0);
hci_dump_packet(HCI_COMMAND_DATA_PACKET, 0, hci_stack->hci_packet_buffer, size);
hci_stack->substate = HCI_INIT_W4_CUSTOM_INIT; // more init commands
switch (valid_cmd) {
case 1:
default:
hci_stack->substate = HCI_INIT_W4_CUSTOM_INIT;
break;
case 2: // CSR Warm Boot: Wait a bit, then send HCI Reset until HCI Command Complete
log_info("CSR Warm Boot");
run_loop_set_timer(&hci_stack->timeout, 100);
run_loop_set_timer_handler(&hci_stack->timeout, hci_initialization_timeout_handler);
run_loop_add_timer(&hci_stack->timeout);
hci_stack->substate = HCI_INIT_W4_CUSTOM_INIT_CSR_WARM_BOOT;
break;
}
hci_stack->hci_transport->send_packet(HCI_COMMAND_DATA_PACKET, hci_stack->hci_packet_buffer, size);
break;
}
@ -980,6 +1007,11 @@ static void hci_initializing_event_handler(uint8_t * packet, uint16_t size){
log_info("Command status for opcode %04x, expected %04x", opcode, hci_stack->last_cmd_opcode);
}
}
// Vendor == CSR
if (packet[0] == HCI_EVENT_VENDOR_SPECIFIC){
// TODO: track actual command
command_completed = 1;
}
if (!command_completed) return;
@ -997,7 +1029,12 @@ static void hci_initializing_event_handler(uint8_t * packet, uint16_t size){
return;
}
}
break;
hci_stack->substate = HCI_INIT_READ_BUFFER_SIZE;
return;
case HCI_INIT_W4_CUSTOM_INIT_CSR_WARM_BOOT:
run_loop_remove_timer(&hci_stack->timeout);
hci_stack->substate = HCI_INIT_CUSTOM_INIT;
return;
case HCI_INIT_LOCAL_BAUD_CHANGE:
log_info("Local baud rate change");
hci_stack->hci_transport->set_baudrate(((hci_uart_config_t *)hci_stack->config)->baudrate_main);

2
src/hci.h
View File

@ -538,6 +538,8 @@ typedef enum hci_init_state{
HCI_INIT_W4_SET_BD_ADDR,
HCI_INIT_CUSTOM_INIT,
HCI_INIT_W4_CUSTOM_INIT,
HCI_INIT_SEND_RESET_CSR_WARM_BOOT,
HCI_INIT_W4_CUSTOM_INIT_CSR_WARM_BOOT,
HCI_INIT_READ_BD_ADDR,
HCI_INIT_W4_READ_BD_ADDR,