Merge branch 'bugfix/hfp_co_build_err_v6.0' into 'release/v6.0'

fix(bt/bluedroid): fixed building errors in HFP datapath (v6.0)

See merge request espressif/esp-idf!48567
This commit is contained in:
Jiang Jiang Jian
2026-05-15 19:24:14 +08:00
5 changed files with 36 additions and 4 deletions
@@ -71,7 +71,7 @@ static bta_hf_ct_plc_t *bta_hf_ct_plc_ptr;
#define BTA_HF_H2_HEADER_SN1_BIT_OFFSET2 15 #define BTA_HF_H2_HEADER_SN1_BIT_OFFSET2 15
#define BTA_HF_H2_HEADER_SYNC_WORD_CHECK(p) \ #define BTA_HF_H2_HEADER_SYNC_WORD_CHECK(p) \
((((UINT16)(((UINT8 *)(p))[0])) | (((UINT16)(((UINT8 *)(p))[1])) << 8)) & \ (((((UINT16)(((UINT8 *)(p))[0])) | (((UINT16)(((UINT8 *)(p))[1])) << 8)) & \
BTA_HF_H2_HEADER_SYNC_WORD_MASK) == \ BTA_HF_H2_HEADER_SYNC_WORD_MASK) == \
BTA_HF_H2_HEADER_SYNC_WORD) BTA_HF_H2_HEADER_SYNC_WORD)
@@ -31,7 +31,7 @@
#define BTA_HF_H2_HEADER_SN1_BIT_OFFSET2 15 #define BTA_HF_H2_HEADER_SN1_BIT_OFFSET2 15
#define BTA_HF_H2_HEADER_SYNC_WORD_CHECK(p) \ #define BTA_HF_H2_HEADER_SYNC_WORD_CHECK(p) \
((((UINT16)(((UINT8 *)(p))[0])) | (((UINT16)(((UINT8 *)(p))[1])) << 8)) & \ (((((UINT16)(((UINT8 *)(p))[0])) | (((UINT16)(((UINT8 *)(p))[1])) << 8)) & \
BTA_HF_H2_HEADER_SYNC_WORD_MASK) == \ BTA_HF_H2_HEADER_SYNC_WORD_MASK) == \
BTA_HF_H2_HEADER_SYNC_WORD) BTA_HF_H2_HEADER_SYNC_WORD)
@@ -538,7 +538,7 @@ void bta_hf_client_sco_co_in_data(BT_HDR *p_buf, tBTM_SCO_DATA_FLAG status)
} }
btc_hf_client_audio_data_cb_to_app((uint8_t *)p_new_buf, (uint8_t *)p_data, BTM_MSBC_FRAME_SIZE, bta_hf_client_co_cb.is_bad_frame); btc_hf_client_audio_data_cb_to_app((uint8_t *)p_new_buf, (uint8_t *)p_data, BTM_MSBC_FRAME_SIZE, bta_hf_client_co_cb.is_bad_frame);
bta_hf_client_co_cb.is_bad_frame = false; bta_hf_client_co_cb.is_bad_frame = false;
memset(bta_hf_client_co_cb.rx_half_msbc_data, 0, BTM_MSBC_FRAME_SIZE); memset(bta_hf_client_co_cb.rx_half_msbc_data, 0, BTM_MSBC_FRAME_SIZE / 2);
} }
bta_hf_client_co_cb.rx_first_pkt = !bta_hf_client_co_cb.rx_first_pkt; bta_hf_client_co_cb.rx_first_pkt = !bta_hf_client_co_cb.rx_first_pkt;
} }
@@ -0,0 +1,13 @@
# Override some defaults so BT stack is enabled and
# Classic BT is enabled and BT_DRAM_RELEASE is disabled
CONFIG_BT_ENABLED=y
CONFIG_BT_BLE_ENABLED=n
CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=1
CONFIG_BT_BLUEDROID_ENABLED=y
CONFIG_BT_CLASSIC_ENABLED=y
CONFIG_BT_HFP_ENABLE=y
CONFIG_BT_HFP_AG_ENABLE=y
CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI=y
CONFIG_BT_HFP_USE_EXTERNAL_CODEC=y
CONFIG_EXAMPLE_ENABLE_CONSOLE_REPL=n
@@ -0,0 +1,13 @@
# Override some defaults so BT stack is enabled and
# Classic BT is enabled and BT_DRAM_RELEASE is disabled
CONFIG_BT_ENABLED=y
CONFIG_BT_BLE_ENABLED=n
CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=1
CONFIG_BT_BLUEDROID_ENABLED=y
CONFIG_BT_CLASSIC_ENABLED=y
CONFIG_BT_HFP_ENABLE=y
CONFIG_BT_HFP_CLIENT_ENABLE=y
CONFIG_BT_HFP_AUDIO_DATA_PATH_HCI=y
CONFIG_BT_HFP_USE_EXTERNAL_CODEC=y
CONFIG_EXAMPLE_ENABLE_CONSOLE_REPL=n
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
from pathlib import Path from pathlib import Path
@@ -82,6 +82,12 @@ def test_bt_spp_vfs(app_path: str, dut: tuple[IdfDut, IdfDut]) -> None:
'esp32|esp32', 'esp32|esp32',
'all', 'all',
), ),
(
2,
f'{str(CUR_DIR / "hfp_ag")}|{str(CUR_DIR / "hfp_hf")}',
'esp32|esp32',
'extcodec',
),
], ],
indirect=True, indirect=True,
) )