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

hfp_hf: enable madatory safe settings for HCI responder with ENABLE_HFP_HF_SAFE_SETTINGS

Browse Source
This commit is contained in:
Matthias Ringwald 2023-09-25 15:19:20 +02:00
parent 715d9d6a34
commit c169b70d58
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/classic/hfp.c
View File

@ -122,7 +122,8 @@ static const struct {
{0x000d, 0x02, SCO_PACKET_TYPES_2EV3, CODEC_MASK_OTHER} // HFP_LINK_SETTINGS_T2 {0x000d, 0x02, SCO_PACKET_TYPES_2EV3, CODEC_MASK_OTHER} // HFP_LINK_SETTINGS_T2
}; };
// table 5.8 'mandatory safe settings' for eSCO + similar entries for SCO #ifdef ENABLE_HFP_HF_SAFE_SETTINGS
// HFP v1.9, table 6.10 'mandatory safe settings' for eSCO + similar entries for SCO
static const struct hfp_mandatory_safe_setting { static const struct hfp_mandatory_safe_setting {
const uint8_t codec_mask; const uint8_t codec_mask;
const bool secure_connection_in_use; const bool secure_connection_in_use;
@ -135,6 +136,7 @@ static const struct hfp_mandatory_safe_setting {
{ CODEC_MASK_OTHER, false, HFP_LINK_SETTINGS_T1}, { CODEC_MASK_OTHER, false, HFP_LINK_SETTINGS_T1},
{ CODEC_MASK_OTHER, true, HFP_LINK_SETTINGS_T2}, { CODEC_MASK_OTHER, true, HFP_LINK_SETTINGS_T2},
}; };
#endif
static const char * hfp_hf_features[] = { static const char * hfp_hf_features[] = {
"EC and/or NR function", "EC and/or NR function",
@ -2030,6 +2032,7 @@ void hfp_setup_synchronous_connection(hfp_connection_t * hfp_connection){
#endif #endif
} }
#ifdef ENABLE_HFP_HF_SAFE_SETTINGS
hfp_link_settings_t hfp_safe_settings_for_context(bool use_eSCO, uint8_t negotiated_codec, bool secure_connection_in_use){ hfp_link_settings_t hfp_safe_settings_for_context(bool use_eSCO, uint8_t negotiated_codec, bool secure_connection_in_use){
uint8_t i; uint8_t i;
hfp_link_settings_t link_setting = HFP_LINK_SETTINGS_NONE; hfp_link_settings_t link_setting = HFP_LINK_SETTINGS_NONE;
@ -2044,30 +2047,41 @@ hfp_link_settings_t hfp_safe_settings_for_context(bool use_eSCO, uint8_t negotia
} }
return link_setting; return link_setting;
} }
#endif
void hfp_accept_synchronous_connection(hfp_connection_t * hfp_connection, bool use_eSCO){ void hfp_accept_synchronous_connection(hfp_connection_t * hfp_connection, bool use_eSCO){
hfp_sco_establishment_active = hfp_connection; hfp_sco_establishment_active = hfp_connection;
bool secure_connection_in_use = gap_secure_connection(hfp_connection->acl_handle);
// lookup safe settings based on SCO type, SC use and Codec type // lookup safe settings based on SCO type, SC use and Codec type
uint16_t max_latency; uint16_t max_latency;
uint16_t packet_types; uint16_t packet_types;
uint16_t retransmission_effort; uint16_t retransmission_effort;
hfp_link_settings_t link_setting = HFP_LINK_SETTINGS_NONE; hfp_link_settings_t link_setting = HFP_LINK_SETTINGS_NONE;
#ifdef ENABLE_HFP_HF_SAFE_SETTINGS
// fallback for non-CVSD codec and SCO connection // fallback for non-CVSD codec and SCO connection
if ((hfp_connection->negotiated_codec != HFP_CODEC_CVSD) && (use_eSCO == false)){ if ((hfp_connection->negotiated_codec != HFP_CODEC_CVSD) && (use_eSCO == false)){
max_latency = 0xffff; max_latency = 0xffff;
retransmission_effort = 0xff; retransmission_effort = 0xff;
packet_types = SCO_PACKET_TYPES_HV3 | SCO_PACKET_TYPES_HV1; packet_types = SCO_PACKET_TYPES_HV3 | SCO_PACKET_TYPES_HV1;
} else { } else {
// use safe settings from HFP v1.9, table 6.10
bool secure_connection_in_use = gap_secure_connection(hfp_connection->acl_handle);
link_setting = hfp_safe_settings_for_context(use_eSCO, hfp_connection->negotiated_codec, secure_connection_in_use); link_setting = hfp_safe_settings_for_context(use_eSCO, hfp_connection->negotiated_codec, secure_connection_in_use);
max_latency = hfp_link_settings[(uint8_t) link_setting].max_latency; max_latency = hfp_link_settings[(uint8_t) link_setting].max_latency;
retransmission_effort = hfp_link_settings[(uint8_t) link_setting].retransmission_effort; retransmission_effort = hfp_link_settings[(uint8_t) link_setting].retransmission_effort;
packet_types = hfp_link_settings[(uint8_t) link_setting].packet_types; packet_types = hfp_link_settings[(uint8_t) link_setting].packet_types;
} }
#else
max_latency = 0xffff;
retransmission_effort = 0xff;
if (use_eSCO) {
packet_types = SCO_PACKET_TYPES_EV3 | SCO_PACKET_TYPES_2EV3;
} else {
packet_types = SCO_PACKET_TYPES_HV3 | SCO_PACKET_TYPES_HV1;
}
#endif
// transparent data for non-CVSD connections or if codec provided by Controller // transparent data for non-CVSD connections or if codec provided by Controller
uint16_t sco_voice_setting = hci_get_sco_voice_setting(); uint16_t sco_voice_setting = hci_get_sco_voice_setting();