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

hci: replace '00:00:00:00:00:00' placeholder in EIR data with actual BD ADDR

Browse Source
This commit is contained in:
Matthias Ringwald 2017-08-16 17:26:48 +02:00
parent fdfcab43ce
commit 29af07f3ba
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gap.h
View File

@ -126,13 +126,15 @@ gap_connection_type_t gap_get_connection_type(hci_con_handle_t connection_handle
* @brief Sets local name.
* @note has to be done before stack starts up
* @param name is not copied, make sure memory is accessible during stack startup
* @note '00:00:00:00:00:00' in local_name will be replaced with actual name
*/
void gap_set_local_name(const char * local_name);
/**
* @brief Set Extended Inquiry Response data
* @param eir_data size 240 bytes, is not copied make sure memory is accessible during stack startup
* @note has to be done before stack starts up
* @param eir_data size 240 bytes, is not copied make sure memory is accessible during stack startup
* @note '00:00:00:00:00:00' in local_name will be replaced with actual name
*/
void gap_set_extended_inquiry_response(const uint8_t * data);

17
src/hci.c
View File

@ -1277,10 +1277,23 @@ static void hci_initializing_run(void){
hci_send_cmd_packet(packet, HCI_CMD_HEADER_SIZE + DEVICE_NAME_LEN);
break;
}
case HCI_INIT_WRITE_EIR_DATA:
case HCI_INIT_WRITE_EIR_DATA: {
hci_stack->substate = HCI_INIT_W4_WRITE_EIR_DATA;
hci_send_cmd(&hci_write_extended_inquiry_response, 0, hci_stack->eir_data);
hci_reserve_packet_buffer();
uint8_t * packet = hci_stack->hci_packet_buffer;
// construct HCI Command and send
uint16_t opcode = hci_write_extended_inquiry_response.opcode;
hci_stack->last_cmd_opcode = opcode;
packet[0] = opcode & 0xff;
packet[1] = opcode >> 8;
packet[2] = 1 + 240;
packet[3] = 0; // FEC not required
memcpy(&packet[4], hci_stack->eir_data, 240);
// expand '00:00:00:00:00:00' in name with bd_addr
hci_replace_bd_addr_placeholder(&packet[4], 240);
hci_send_cmd_packet(packet, HCI_CMD_HEADER_SIZE + DEVICE_NAME_LEN);
break;
}
case HCI_INIT_WRITE_INQUIRY_MODE:
hci_stack->substate = HCI_INIT_W4_WRITE_INQUIRY_MODE;
hci_send_cmd(&hci_write_inquiry_mode, (int) hci_stack->inquiry_mode);