test: avoid HCI_EVENT_IS_COMMAND_COMPLETE macro

This commit is contained in:
Matthias Ringwald 2022-05-09 21:47:36 +02:00
parent d39264f239
commit a9ec7ee053
7 changed files with 28 additions and 30 deletions

View File

@ -141,7 +141,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
if (btstack_event_state_get_state(packet) != HCI_STATE_WORKING) return;
break;
case HCI_EVENT_COMMAND_COMPLETE:
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_read_local_version_information)){
if (hci_event_command_complete_get_command_opcode(packet) == HCI_OPCODE_HCI_READ_LOCAL_VERSION_INFORMATION){
local_version_information_handler(packet);
}
if (memcmp(packet, read_static_address_command_complete_prefix, sizeof(read_static_address_command_complete_prefix)) == 0){

View File

@ -143,19 +143,23 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
}
break;
case HCI_EVENT_COMMAND_COMPLETE:
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_read_local_name)){
if (hci_event_command_complete_get_return_parameters(packet)[0]) break;
// terminate, name 248 chars
packet[6+248] = 0;
printf("Local name: %s\n", &packet[6]);
}
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_read_local_version_information)){
local_version_information_handler(packet);
}
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_zephyr_read_static_address)){
reverse_48(&packet[7], zephyr_static_address);
gap_random_address_set(zephyr_static_address);
setup_tlv(zephyr_static_address);
switch (hci_event_command_complete_get_command_opcode(packet)){
case HCI_OPCODE_HCI_READ_BD_ADDR:
if (hci_event_command_complete_get_return_parameters(packet)[0]) break;
// terminate, name 248 chars
packet[6+248] = 0;
printf("Local name: %s\n", &packet[6]);
break;
case HCI_OPCODE_HCI_READ_LOCAL_VERSION_INFORMATION:
local_version_information_handler(packet);
break;
case HCI_OPCODE_ZEPHYR_READ_STATIC_ADDRESS:
reverse_48(&packet[7], zephyr_static_address);
gap_random_address_set(zephyr_static_address);
setup_tlv(zephyr_static_address);
break;
default:
break;
}
break;
default:

View File

@ -108,7 +108,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
btstack_tlv_set_instance(tlv_impl, &tlv_context);
break;
case HCI_EVENT_COMMAND_COMPLETE:
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_read_local_version_information)){
if (hci_event_command_complete_get_command_opcode(packet) == HCI_OPCODE_HCI_READ_LOCAL_VERSION_INFORMATION){
local_version_information_handler(packet);
}
break;

View File

@ -689,7 +689,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
break;
case HCI_EVENT_COMMAND_COMPLETE:
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_read_bd_addr)){
if (hci_event_command_complete_get_command_opcode(packet) == HCI_OPCODE_HCI_READ_BD_ADDR){
reverse_bd_addr(&packet[6], local_addr);
printf("BD-ADDR: %s\n", bd_addr_to_str(local_addr));
break;

View File

@ -514,13 +514,14 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * even
switch (packet_type){
case HCI_EVENT_PACKET:
switch(hci_event_packet_get_type(event)){
#ifndef HAVE_BTSTACK_STDIN
case BTSTACK_EVENT_STATE:
if (btstack_event_state_get_state(event) != HCI_STATE_WORKING) break;
dump_supported_codecs();
#ifndef HAVE_BTSTACK_STDIN
printf("Establish HFP AG service level connection to %s...\n", bd_addr_to_str(device_addr));
hfp_ag_establish_service_level_connection(device_addr);
break;
#endif
break;
case GAP_EVENT_INQUIRY_RESULT:
gap_event_inquiry_result_get_bd_addr(event, addr);
// print info
@ -544,11 +545,6 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * even
case HCI_EVENT_SCO_CAN_SEND_NOW:
sco_demo_send(sco_handle);
break;
case HCI_EVENT_COMMAND_COMPLETE:
if (HCI_EVENT_IS_COMMAND_COMPLETE(event, hci_read_local_supported_features)){
dump_supported_codecs();
}
break;
default:
break;
}

View File

@ -454,16 +454,14 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * even
case HCI_EVENT_PACKET:
switch (hci_event_packet_get_type(event)){
case BTSTACK_EVENT_STATE:
if (btstack_event_state_get_state(event) != HCI_STATE_WORKING) break;
dump_supported_codecs();
break;
case HCI_EVENT_SCO_CAN_SEND_NOW:
sco_demo_send(sco_handle);
break;
case HCI_EVENT_COMMAND_COMPLETE:
if (HCI_EVENT_IS_COMMAND_COMPLETE(event, hci_read_local_supported_features)){
dump_supported_codecs();
}
break;
case HCI_EVENT_HFP_META:
switch (hci_event_hfp_meta_get_subevent_code(event)) {
case HFP_SUBEVENT_IN_BAND_RING_TONE:

View File

@ -142,7 +142,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
if (btstack_event_state_get_state(packet) != HCI_STATE_WORKING) return;
break;
case HCI_EVENT_COMMAND_COMPLETE:
if (HCI_EVENT_IS_COMMAND_COMPLETE(packet, hci_read_local_version_information)){
if (hci_event_command_complete_get_command_opcode(packet) == HCI_OPCODE_HCI_READ_LOCAL_VERSION_INFORMATION){
local_version_information_handler(packet);
}
if (memcmp(packet, read_static_address_command_complete_prefix, sizeof(read_static_address_command_complete_prefix)) == 0){