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

move common LE init code into hci.c

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2013-10-17 14:45:43 +00:00
parent 55ca6c7131
commit 24052c2afd
3 changed files with 35 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MSP-EXP430F5438-CC256x/example-ble/ble_server.c
View File

@ -142,8 +142,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) {
printf("Working!\n");
hci_send_cmd(&hci_read_local_supported_features);
printf("Working!\n");
hci_send_cmd(&hci_le_set_advertising_parameters, 0x0400, 0x0800, 0, 0, 0, &addr, 0x07, 0);
}
break;
@ -184,32 +184,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
printf("BD ADDR: %s\n", bd_addr_to_str(addr));
break;
}
if (COMMAND_COMPLETE_EVENT(packet, hci_read_local_supported_features)){
// printf("Local supported features: %04X%04X\n", READ_BT_32(packet, 10), READ_BT_32(packet, 6));
hci_send_cmd(&hci_set_event_mask, 0xffffffff, 0x20001fff);
break;
}
if (COMMAND_COMPLETE_EVENT(packet, hci_set_event_mask)){
hci_send_cmd(&hci_write_le_host_supported, 1, 1);
break;
}
if (COMMAND_COMPLETE_EVENT(packet, hci_write_le_host_supported)){
hci_send_cmd(&hci_le_set_event_mask, 0xffffffff, 0xffffffff);
break;
}
if (COMMAND_COMPLETE_EVENT(packet, hci_le_set_event_mask)){
hci_send_cmd(&hci_le_read_buffer_size);
break;
}
if (COMMAND_COMPLETE_EVENT(packet, hci_le_read_buffer_size)){
printf("LE buffer size: %u, count %u\n", READ_BT_16(packet,6), packet[8]);
hci_send_cmd(&hci_le_read_supported_states);
break;
}
if (COMMAND_COMPLETE_EVENT(packet, hci_le_read_supported_states)){
hci_send_cmd(&hci_le_set_advertising_parameters, 0x0400, 0x0800, 0, 0, 0, &addr, 0x07, 0);
break;
}
if (COMMAND_COMPLETE_EVENT(packet, hci_le_set_advertising_parameters)){
hci_send_cmd(&hci_le_set_advertising_data, sizeof(adv_data), adv_data);
break;

17
example/libusb/ble_server.c
View File

@ -103,8 +103,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
// bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) {
printf("Working!\n");
// into hci.c
hci_send_cmd(&hci_write_le_host_supported, 1, 1);
// only needed for BLE Peripheral, consider sending these as a default
hci_send_cmd(&hci_le_set_advertising_parameters, 0x0400, 0x0800, 0, 0, 0, &addr, 0x07, 0);
}
break;
@ -132,19 +132,6 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
break;
case HCI_EVENT_COMMAND_COMPLETE:
if (COMMAND_COMPLETE_EVENT(packet, hci_write_le_host_supported)){
// into hci.c
hci_send_cmd(&hci_le_read_buffer_size);
break;
}
if (COMMAND_COMPLETE_EVENT(packet, hci_le_read_buffer_size)){
printf("LE buffer size: %u, count %u\n", READ_BT_16(packet,6), packet[8]);
// only needed for BLE Peripheral, consider sending these as a default
hci_send_cmd(&hci_le_set_advertising_parameters, 0x0400, 0x0800, 0, 0, 0, &addr, 0x07, 0);
break;
}
if (COMMAND_COMPLETE_EVENT(packet, hci_le_set_advertising_parameters)){
// only needed for BLE Peripheral
hci_send_cmd(&hci_le_set_advertising_data, sizeof(adv_data), adv_data);

39
src/hci.c
View File

@ -1180,6 +1180,7 @@ void hci_run(){
switch (hci_stack.substate >> 1){
case 0: // RESET
hci_send_cmd(&hci_reset);
if (hci_stack.config == 0 || ((hci_uart_config_t *)hci_stack.config)->baudrate_main == 0){
// skip baud change
hci_stack.substate = 4; // >> 1 = 2
@ -1195,7 +1196,7 @@ void hci_run(){
// break missing here for fall through
case 3:
// custom initialization
// Custom initialization
if (hci_stack.control && hci_stack.control->next_cmd){
int valid_cmd = (*hci_stack.control->next_cmd)(hci_stack.config, hci_stack.hci_packet_buffer);
if (valid_cmd){
@ -1219,17 +1220,23 @@ void hci_run(){
hci_send_cmd(&hci_set_event_mask,0xffffffff, 0xFFFFFFFF); ///0x1DFFFFFF
// skip Classic init commands for LE only chipsets
if (hci_classic_supported()){
if (!hci_ssp_supported()){
hci_stack.substate = 7 << 1; // skip hci_write_simple_pairing_mode
if (!hci_classic_supported()){
if (hci_le_supported()){
hci_stack.substate = 11 << 1; // skip all classic command
} else {
log_error("Neither BR/EDR nor LE supported");
hci_stack.substate = 13 << 1;
}
} else {
hci_stack.substate = 11 << 1; // skip all classic command
}
break;
case 7:
hci_send_cmd(&hci_write_simple_pairing_mode, hci_stack.ssp_enable);
break;
if (hci_ssp_supported()){
hci_send_cmd(&hci_write_simple_pairing_mode, hci_stack.ssp_enable);
break;
}
hci_stack.substate += 2;
// break missing here for fall through
case 8:
// ca. 15 sec
hci_send_cmd(&hci_write_page_timeout, 0x6000);
@ -1257,8 +1264,24 @@ void hci_run(){
break;
case 11:
hci_send_cmd(&hci_write_scan_enable, (hci_stack.connectable << 1) | hci_stack.discoverable); // page scan
if (!hci_le_supported()){
// SKIP LE init for Classic only configuration
hci_stack.substate = 13 << 1;
}
break;
// LE INIT
case 12:
hci_send_cmd(&hci_le_read_buffer_size);
// printf("LE buffer size: %u, count %u\n", READ_BT_16(packet,6), packet[8]);
break;
case 13:
// LE Supported Host = 1, Simultaneous Host = 0
hci_send_cmd(&hci_write_le_host_supported, 1, 0);
break;
// DONE
case 14:
// done.
hci_stack.state = HCI_STATE_WORKING;
hci_emit_state();