Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 10:40:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/hfp_macro' into 'master'

Browse Source 
fix(bt_hfp): Fix macro definition

See merge request espressif/esp-idf!52383
This commit is contained in:
Wang Meng Yang
2026-09-04 08:57:22 +08:00
parent 8b0f252f11 f772cd6d38
commit 5f17193ef0
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/host/bluedroid/bta/hf_ag/bta_ag_cmd.c
+6 -6
View File
@@ -689,7 +689,7 @@ static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB *p_scb, char *p_s)
case UUID_CODEC_CVSD:
retval |= BTA_AG_CODEC_CVSD;
break;
#if (BTM_WBS_INCLUDED == TRUE)
case UUID_CODEC_MSBC:
retval |= BTA_AG_CODEC_MSBC;
break;
@@ -697,7 +697,7 @@ static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB *p_scb, char *p_s)
case UUID_CODEC_LC3:
retval |= BTA_AG_CODEC_LC3;
break;
#endif
default:
APPL_TRACE_ERROR("Unknown Codec UUID(%d) received", uuid_codec);
break;
@@ -1223,7 +1223,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB *p_scb, UINT16 cmd, UINT8 arg_type,
case UUID_CODEC_CVSD:
codec_type = BTA_AG_CODEC_CVSD;
break;
#if (BTM_WBS_INCLUDED == TRUE)
case UUID_CODEC_MSBC:
codec_type = BTA_AG_CODEC_MSBC;
break;
@@ -1231,7 +1231,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB *p_scb, UINT16 cmd, UINT8 arg_type,
case UUID_CODEC_LC3:
codec_type = BTA_AG_CODEC_LC3;
break;
#endif
default:
APPL_TRACE_ERROR("Unknown codec_uuid %d", int_arg);
codec_type = 0xFFFF;
@@ -1698,7 +1698,7 @@ void bta_ag_send_bcs(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
case BTA_AG_CODEC_CVSD:
codec_uuid = UUID_CODEC_CVSD;
break;
#if (BTM_WBS_INCLUDED == TRUE)
case BTA_AG_CODEC_MSBC:
codec_uuid = UUID_CODEC_MSBC;
break;
@@ -1706,7 +1706,7 @@ void bta_ag_send_bcs(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
case BTA_AG_CODEC_LC3:
codec_uuid = UUID_CODEC_LC3;
break;
#endif
default:
APPL_TRACE_ERROR("bta_ag_send_bcs: unknown codec %d, use CVSD", p_scb->sco_codec);
codec_uuid = UUID_CODEC_CVSD;
components/bt/host/bluedroid/bta/hf_client/bta_hf_client_at.c
+4
View File
@@ -493,10 +493,12 @@ static void bta_hf_client_handle_ciev(UINT32 index, UINT32 value)
static tBTM_SCO_CODEC_TYPE bta_hf_client_hfp_codec_id_to_btm(UINT32 hfp_codec_id)
{
switch (hfp_codec_id) {
#if (BTM_WBS_INCLUDED == TRUE)
case UUID_CODEC_MSBC:
return BTM_SCO_CODEC_MSBC;
case UUID_CODEC_LC3:
return BTM_SCO_CODEC_LC3;
#endif
case UUID_CODEC_CVSD:
return BTM_SCO_CODEC_CVSD;
default:
@@ -512,10 +514,12 @@ static tBTM_SCO_CODEC_TYPE bta_hf_client_hfp_codec_id_to_btm(UINT32 hfp_codec_id
static UINT32 bta_hf_client_btm_codec_to_hfp_id(tBTM_SCO_CODEC_TYPE btm_codec)
{
switch (btm_codec) {
#if (BTM_WBS_INCLUDED == TRUE)
case BTM_SCO_CODEC_MSBC:
return UUID_CODEC_MSBC;
case BTM_SCO_CODEC_LC3:
return UUID_CODEC_LC3;
#endif
case BTM_SCO_CODEC_CVSD:
default:
return UUID_CODEC_CVSD;
components/bt/host/bluedroid/stack/include/stack/sdpdefs.h
+1 -2
View File
@@ -275,9 +275,8 @@
#define UUID_SERVCLASS_CSC 0x1816 /* Cycling SPEED AND CADENCE SERVICE */
#define UUID_SERVCLASS_TEST_SERVER 0x9000 /* Test Group UUID */
#if (BTM_WBS_INCLUDED == TRUE)
#define UUID_CODEC_CVSD 0x0001 /* CVSD */
#if (BTM_WBS_INCLUDED == TRUE)
#define UUID_CODEC_MSBC 0x0002 /* mSBC */
#define UUID_CODEC_LC3 0x0003 /* LC3-SWB */
#endif