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

hci: set last_cmd_opcode in hci_send_prepared_cmd_packet

Browse Source
This commit is contained in:
Matthias Ringwald 2024-02-05 11:19:24 +01:00
parent ee418d0f5b
commit f91accd343
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hci.c
View File

@ -1696,8 +1696,6 @@ static void gap_run_set_local_name(void){
(void)memcpy(&packet[3], hci_stack->local_name, bytes_to_copy); (void)memcpy(&packet[3], hci_stack->local_name, bytes_to_copy);
// expand '00:00:00:00:00:00' in name with bd_addr // expand '00:00:00:00:00:00' in name with bd_addr
btstack_replace_bd_addr_placeholder(&packet[3], bytes_to_copy, hci_stack->local_bd_addr); btstack_replace_bd_addr_placeholder(&packet[3], bytes_to_copy, hci_stack->local_bd_addr);
hci_stack->last_cmd_opcode = opcode;
hci_send_prepared_cmd_packet(); hci_send_prepared_cmd_packet();
} }
@ -1738,8 +1736,6 @@ static void gap_run_set_eir_data(void){
// expand '00:00:00:00:00:00' in name with bd_addr // expand '00:00:00:00:00:00' in name with bd_addr
btstack_replace_bd_addr_placeholder(&packet[offset], bytes_to_copy, hci_stack->local_bd_addr); btstack_replace_bd_addr_placeholder(&packet[offset], bytes_to_copy, hci_stack->local_bd_addr);
} }
hci_stack->last_cmd_opcode = opcode;
hci_send_prepared_cmd_packet(); hci_send_prepared_cmd_packet();
} }
@ -1930,7 +1926,6 @@ static void hci_initializing_run(void){
uint32_t baud_rate = hci_transport_uart_get_main_baud_rate(); uint32_t baud_rate = hci_transport_uart_get_main_baud_rate();
hci_stack->chipset->set_baudrate_command(baud_rate, hci_stack->hci_packet_buffer); hci_stack->chipset->set_baudrate_command(baud_rate, hci_stack->hci_packet_buffer);
hci_stack->substate = HCI_INIT_W4_SEND_BAUD_CHANGE_BCM; hci_stack->substate = HCI_INIT_W4_SEND_BAUD_CHANGE_BCM;
hci_stack->last_cmd_opcode = little_endian_read_16(hci_stack->hci_packet_buffer, 0);
hci_send_prepared_cmd_packet(); hci_send_prepared_cmd_packet();
break; break;
} }
@ -1938,7 +1933,6 @@ static void hci_initializing_run(void){
log_info("Set Public BD ADDR to %s", bd_addr_to_str(hci_stack->custom_bd_addr)); log_info("Set Public BD ADDR to %s", bd_addr_to_str(hci_stack->custom_bd_addr));
hci_stack->chipset->set_bd_addr_command(hci_stack->custom_bd_addr, hci_stack->hci_packet_buffer); hci_stack->chipset->set_bd_addr_command(hci_stack->custom_bd_addr, hci_stack->hci_packet_buffer);
hci_stack->substate = HCI_INIT_W4_SET_BD_ADDR; hci_stack->substate = HCI_INIT_W4_SET_BD_ADDR;
hci_stack->last_cmd_opcode = little_endian_read_16(hci_stack->hci_packet_buffer, 0);
hci_send_prepared_cmd_packet(); hci_send_prepared_cmd_packet();
break; break;
case HCI_INIT_SEND_READ_LOCAL_NAME: case HCI_INIT_SEND_READ_LOCAL_NAME:
@ -1954,7 +1948,6 @@ static void hci_initializing_run(void){
uint32_t baud_rate = hci_transport_uart_get_main_baud_rate(); uint32_t baud_rate = hci_transport_uart_get_main_baud_rate();
hci_stack->chipset->set_baudrate_command(baud_rate, hci_stack->hci_packet_buffer); hci_stack->chipset->set_baudrate_command(baud_rate, hci_stack->hci_packet_buffer);
hci_stack->substate = HCI_INIT_W4_SEND_BAUD_CHANGE; hci_stack->substate = HCI_INIT_W4_SEND_BAUD_CHANGE;
hci_stack->last_cmd_opcode = little_endian_read_16(hci_stack->hci_packet_buffer, 0);
hci_send_prepared_cmd_packet(); hci_send_prepared_cmd_packet();
// STLC25000D: baudrate change happens within 0.5 s after command was send, // STLC25000D: baudrate change happens within 0.5 s after command was send,
// use timer to update baud rate after 100 ms (knowing exactly, when command was sent is non-trivial) // use timer to update baud rate after 100 ms (knowing exactly, when command was sent is non-trivial)
@ -2013,7 +2006,6 @@ static void hci_initializing_run(void){
} }
if (send_cmd){ if (send_cmd){
hci_stack->last_cmd_opcode = little_endian_read_16(hci_stack->hci_packet_buffer, 0);
hci_send_prepared_cmd_packet(); hci_send_prepared_cmd_packet();
break; break;
} else { } else {
@ -7593,7 +7585,11 @@ static void hci_set_sco_payload_length_for_flipped_packet_types(hci_connection_t
// funnel for sending cmd packet using single outgoing buffer // funnel for sending cmd packet using single outgoing buffer
static uint8_t hci_send_prepared_cmd_packet() { static uint8_t hci_send_prepared_cmd_packet() {
btstack_assert(hci_stack->hci_packet_buffer_reserved); btstack_assert(hci_stack->hci_packet_buffer_reserved);
// cache opcode
hci_stack->last_cmd_opcode = little_endian_read_16(hci_stack->hci_packet_buffer, 0);
// get size
uint16_t size = 3u + hci_stack->hci_packet_buffer[2u]; uint16_t size = 3u + hci_stack->hci_packet_buffer[2u];
// send packet
uint8_t status = hci_send_cmd_packet(hci_stack->hci_packet_buffer, size); uint8_t status = hci_send_cmd_packet(hci_stack->hci_packet_buffer, size);
// release packet buffer on error or for synchronous transport implementations // release packet buffer on error or for synchronous transport implementations
if ((status != ERROR_CODE_SUCCESS) || hci_transport_synchronous()){ if ((status != ERROR_CODE_SUCCESS) || hci_transport_synchronous()){
@ -7870,13 +7866,8 @@ uint8_t hci_send_cmd_va_arg(const hci_cmd_t * cmd, va_list argptr){
return ERROR_CODE_COMMAND_DISALLOWED; return ERROR_CODE_COMMAND_DISALLOWED;
} }
// for HCI INITIALIZATION
// log_info("hci_send_cmd: opcode %04x", cmd->opcode);
hci_stack->last_cmd_opcode = cmd->opcode;
hci_reserve_packet_buffer(); hci_reserve_packet_buffer();
uint8_t * packet = hci_stack->hci_packet_buffer; hci_cmd_create_from_template(hci_stack->hci_packet_buffer, cmd, argptr);
uint16_t size = hci_cmd_create_from_template(packet, cmd, argptr);
return hci_send_prepared_cmd_packet(); return hci_send_prepared_cmd_packet();
} }