fix(ble/bluedroid): disable vendor hci function

(cherry picked from commit 715184fa36)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
This commit is contained in:
Zhi Wei Jian
2026-01-07 17:24:31 +08:00
parent fcb4030e57
commit fb6c56d180
2 changed files with 18 additions and 1 deletions
@@ -523,6 +523,7 @@ tBTM_STATUS BTM_BleBroadcast(BOOLEAN start, tBTM_START_STOP_ADV_CMPL_CBACK *p_s
} }
#endif // #if (BLE_42_ADV_EN == TRUE) #endif // #if (BLE_42_ADV_EN == TRUE)
#if (BLE_VENDOR_HCI_EN == TRUE)
void BTM_VendorHciEchoCmdCallback(tBTM_VSC_CMPL *p1) void BTM_VendorHciEchoCmdCallback(tBTM_VSC_CMPL *p1)
{ {
#if (!CONFIG_BT_STACK_NO_LOG) #if (!CONFIG_BT_STACK_NO_LOG)
@@ -555,6 +556,7 @@ void BTM_VendorHciEchoCmdTest(uint8_t echo)
&echo, &echo,
BTM_VendorHciEchoCmdCallback); BTM_VendorHciEchoCmdCallback);
} }
#endif // (BLE_VENDOR_HCI_EN == TRUE)
/******************************************************************************* /*******************************************************************************
** **
@@ -499,6 +499,7 @@ void btm_ble_set_privacy_mode_complete(UINT8 *p, UINT16 evt_len)
} }
} }
#if (0)
/******************************************************************************* /*******************************************************************************
VSC that implement controller based privacy VSC that implement controller based privacy
********************************************************************************/ ********************************************************************************/
@@ -534,7 +535,7 @@ void btm_ble_resolving_list_vsc_op_cmpl (tBTM_VSC_CMPL *p_params)
/* RPA offloading enable/disabled */ /* RPA offloading enable/disabled */
} }
} }
#endif
/******************************************************************************* /*******************************************************************************
** **
** Function btm_ble_remove_resolving_list_entry ** Function btm_ble_remove_resolving_list_entry
@@ -569,6 +570,7 @@ tBTM_STATUS btm_ble_remove_resolving_list_entry(tBTM_SEC_DEV_REC *p_dev_rec)
* send key to the controller, but to resolve the random address in host. */ * send key to the controller, but to resolve the random address in host. */
#endif #endif
} else { } else {
#if (0)
UINT8 param[20] = {0}; UINT8 param[20] = {0};
UINT8 *p = param; UINT8 *p = param;
@@ -580,6 +582,7 @@ tBTM_STATUS btm_ble_remove_resolving_list_entry(tBTM_SEC_DEV_REC *p_dev_rec)
BTM_BLE_META_REMOVE_IRK_LEN, BTM_BLE_META_REMOVE_IRK_LEN,
param, param,
btm_ble_resolving_list_vsc_op_cmpl); btm_ble_resolving_list_vsc_op_cmpl);
#endif
} }
if (st == BTM_CMD_STARTED) { if (st == BTM_CMD_STARTED) {
@@ -609,6 +612,7 @@ tBTM_STATUS btm_ble_clear_resolving_list(void)
st = BTM_SUCCESS; st = BTM_SUCCESS;
} }
} else { } else {
#if (0)
UINT8 param[20] = {0}; UINT8 param[20] = {0};
UINT8 *p = param; UINT8 *p = param;
@@ -617,6 +621,7 @@ tBTM_STATUS btm_ble_clear_resolving_list(void)
BTM_BLE_META_CLEAR_IRK_LEN, BTM_BLE_META_CLEAR_IRK_LEN,
param, param,
btm_ble_resolving_list_vsc_op_cmpl); btm_ble_resolving_list_vsc_op_cmpl);
#endif
} }
return st; return st;
@@ -647,6 +652,7 @@ tBTM_STATUS btm_ble_read_resolving_list_entry(tBTM_SEC_DEV_REC *p_dev_rec)
st = BTM_CMD_STARTED; st = BTM_CMD_STARTED;
} }
} else { } else {
#if (0)
UINT8 param[20] = {0}; UINT8 param[20] = {0};
UINT8 *p = param; UINT8 *p = param;
@@ -657,6 +663,7 @@ tBTM_STATUS btm_ble_read_resolving_list_entry(tBTM_SEC_DEV_REC *p_dev_rec)
BTM_BLE_META_READ_IRK_LEN, BTM_BLE_META_READ_IRK_LEN,
param, param,
btm_ble_resolving_list_vsc_op_cmpl); btm_ble_resolving_list_vsc_op_cmpl);
#endif
} }
if (st == BTM_CMD_STARTED) { if (st == BTM_CMD_STARTED) {
@@ -751,6 +758,7 @@ void btm_ble_resume_resolving_list_activity(void)
p_ble_cb->suspended_rl_state = BTM_BLE_RL_IDLE; p_ble_cb->suspended_rl_state = BTM_BLE_RL_IDLE;
} }
#if (0)
/******************************************************************************* /*******************************************************************************
** **
** Function btm_ble_vendor_enable_irk_feature ** Function btm_ble_vendor_enable_irk_feature
@@ -780,6 +788,7 @@ tBTM_STATUS btm_ble_vendor_enable_irk_feature(BOOLEAN enable)
return st; return st;
} }
#endif
/******************************************************************************* /*******************************************************************************
** **
@@ -797,7 +806,9 @@ BOOLEAN btm_ble_exe_disable_resolving_list(void)
} }
if (!controller_get_interface()->supports_ble_privacy()) { if (!controller_get_interface()->supports_ble_privacy()) {
#if (0)
btm_ble_vendor_enable_irk_feature(FALSE); btm_ble_vendor_enable_irk_feature(FALSE);
#endif
} else { } else {
//btsnd_hcic_ble_set_addr_resolution_enable(FALSE); //btsnd_hcic_ble_set_addr_resolution_enable(FALSE);
} }
@@ -821,7 +832,9 @@ void btm_ble_exe_enable_resolving_list(void)
} }
if (!controller_get_interface()->supports_ble_privacy()) { if (!controller_get_interface()->supports_ble_privacy()) {
#if (0)
btm_ble_vendor_enable_irk_feature(TRUE); btm_ble_vendor_enable_irk_feature(TRUE);
#endif
} else { } else {
//btsnd_hcic_ble_set_addr_resolution_enable(TRUE); //btsnd_hcic_ble_set_addr_resolution_enable(TRUE);
} }
@@ -930,6 +943,7 @@ BOOLEAN btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC *p_dev_rec)
#endif #endif
} else { } else {
#if (0)
UINT8 param[40] = {0}; UINT8 param[40] = {0};
UINT8 *p = param; UINT8 *p = param;
@@ -945,6 +959,7 @@ BOOLEAN btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC *p_dev_rec)
== BTM_CMD_STARTED) { == BTM_CMD_STARTED) {
rt = TRUE; rt = TRUE;
} }
#endif
} }
if (rt) { if (rt) {