mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-26 20:37:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

hci: use max le data length if supported by controller

Browse Source
This commit is contained in:
Matthias Ringwald 2017-07-07 17:15:14 +02:00
parent 220006fb3b
commit dcd678ba09
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hci.c
View File

@ -1297,6 +1297,15 @@ static void hci_initializing_run(void){
hci_stack->substate = HCI_INIT_W4_WRITE_LE_HOST_SUPPORTED;
hci_send_cmd(&hci_write_le_host_supported, 1, 0);
break;
case HCI_INIT_LE_READ_MAX_DATA_LENGTH:
hci_stack->substate = HCI_INIT_W4_LE_READ_MAX_DATA_LENGTH;
hci_send_cmd(&hci_le_read_maximum_data_length);
break;
case HCI_INIT_LE_WRITE_SUGGESTED_DATA_LENGTH:
hci_stack->substate = HCI_INIT_W4_LE_WRITE_SUGGESTED_DATA_LENGTH;
// TODO: use values from read max data length
hci_send_cmd(&hci_le_write_suggested_default_data_length, 251, 2120);
break;
#ifdef ENABLE_LE_CENTRAL
case HCI_INIT_READ_WHITE_LIST_SIZE:
hci_stack->substate = HCI_INIT_W4_READ_WHITE_LIST_SIZE;
@ -1550,7 +1559,7 @@ static void hci_initializing_event_handler(uint8_t * packet, uint16_t size){
// skip write le host if not supported (e.g. on LE only EM9301)
if (hci_stack->local_supported_commands[0] & 0x02) break;
#ifdef ENABLE_LE_CENTRAL
hci_stack->substate = HCI_INIT_READ_WHITE_LIST_SIZE;
hci_stack->substate = HCI_INIT_LE_READ_MAX_DATA_LENGTH;
#else
hci_init_done();
#endif
@ -1669,12 +1678,17 @@ static void event_handler(uint8_t *packet, int size){
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_le_read_buffer_size)){
hci_stack->le_data_packets_length = little_endian_read_16(packet, 6);
hci_stack->le_acl_packets_total_num = packet[8];
// determine usable ACL payload size
if (HCI_ACL_PAYLOAD_SIZE < hci_stack->le_data_packets_length){
hci_stack->le_data_packets_length = HCI_ACL_PAYLOAD_SIZE;
}
// determine usable ACL payload size
if (HCI_ACL_PAYLOAD_SIZE < hci_stack->le_data_packets_length){
hci_stack->le_data_packets_length = HCI_ACL_PAYLOAD_SIZE;
}
log_info("hci_le_read_buffer_size: size %u, count %u", hci_stack->le_data_packets_length, hci_stack->le_acl_packets_total_num);
}
}
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_le_read_maximum_data_length)){
hci_stack->le_supported_max_tx_octets = little_endian_read_16(packet, 6);
hci_stack->le_supported_max_tx_time = little_endian_read_16(packet, 8);
log_info("hci_le_read_maximum_data_length: tx octets %u, tx time %u us", hci_stack->le_supported_max_tx_octets, hci_stack->le_supported_max_tx_time);
}
#ifdef ENABLE_LE_CENTRAL
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_le_read_white_list_size)){
hci_stack->le_whitelist_capacity = packet[6];

8
src/hci.h
View File

@ -598,6 +598,10 @@ typedef enum hci_init_state{
HCI_INIT_W4_LE_READ_BUFFER_SIZE,
HCI_INIT_WRITE_LE_HOST_SUPPORTED,
HCI_INIT_W4_WRITE_LE_HOST_SUPPORTED,
HCI_INIT_LE_READ_MAX_DATA_LENGTH,
HCI_INIT_W4_LE_READ_MAX_DATA_LENGTH,
HCI_INIT_LE_WRITE_SUGGESTED_DATA_LENGTH,
HCI_INIT_W4_LE_WRITE_SUGGESTED_DATA_LENGTH,
#endif
#ifdef ENABLE_LE_CENTRAL
@ -816,6 +820,10 @@ typedef struct {
bd_addr_t le_advertisements_direct_address;
#endif
// LE Data Length
uint16_t le_supported_max_tx_octets;
uint16_t le_supported_max_tx_time;
// custom BD ADDR
bd_addr_t custom_bd_addr;
uint8_t custom_bd_addr_set;

2
src/hci_cmd.c
View File

@ -1099,7 +1099,7 @@ OPCODE(OGF_LE_CONTROLLER, 0x23), ""
* @param suggested_max_tx_time
*/
const hci_cmd_t hci_le_write_suggested_default_data_length = {
OPCODE(OGF_LE_CONTROLLER, 0x24), ""
OPCODE(OGF_LE_CONTROLLER, 0x24), "22"
// return: status
};