From 36e5dbfa8614b157c5ed6949df6e1687fe06b7ea Mon Sep 17 00:00:00 2001
From: zhiweijian <zhiweijian@espressif.com>
Date: Thu, 20 Nov 2025 10:35:09 +0800
Subject: [PATCH] fix(ble/bluedroid): disable vendor hci function

---
 .../bt/host/bluedroid/stack/btm/btm_ble_gap.c   |  2 ++
 .../host/bluedroid/stack/btm/btm_ble_privacy.c  | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/components/bt/host/bluedroid/stack/btm/btm_ble_gap.c b/components/bt/host/bluedroid/stack/btm/btm_ble_gap.c
index fc7e06da112..3f42f2ce5e4 100644
--- a/components/bt/host/bluedroid/stack/btm/btm_ble_gap.c
+++ b/components/bt/host/bluedroid/stack/btm/btm_ble_gap.c
@@ -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)
 
+#if (BLE_VENDOR_HCI_EN == TRUE)
 void BTM_VendorHciEchoCmdCallback(tBTM_VSC_CMPL *p1)
 {
 #if (!CONFIG_BT_STACK_NO_LOG)
@@ -555,6 +556,7 @@ void BTM_VendorHciEchoCmdTest(uint8_t echo)
                                 &echo,
                                 BTM_VendorHciEchoCmdCallback);
 }
+#endif // (BLE_VENDOR_HCI_EN == TRUE)
 
 /*******************************************************************************
 **
diff --git a/components/bt/host/bluedroid/stack/btm/btm_ble_privacy.c b/components/bt/host/bluedroid/stack/btm/btm_ble_privacy.c
index 16617f3bd03..0db4c841e73 100644
--- a/components/bt/host/bluedroid/stack/btm/btm_ble_privacy.c
+++ b/components/bt/host/bluedroid/stack/btm/btm_ble_privacy.c
@@ -498,6 +498,7 @@ void btm_ble_set_privacy_mode_complete(UINT8 *p, UINT16 evt_len)
     }
 }
 
+#if (0)
 /*******************************************************************************
                 VSC that implement controller based privacy
 ********************************************************************************/
@@ -533,7 +534,7 @@ void btm_ble_resolving_list_vsc_op_cmpl (tBTM_VSC_CMPL *p_params)
         /* RPA offloading enable/disabled */
     }
 }
-
+#endif
 /*******************************************************************************
 **
 ** Function         btm_ble_remove_resolving_list_entry
@@ -568,6 +569,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. */
         #endif
     } else {
+#if (0)
         UINT8 param[20] = {0};
         UINT8 *p = param;
 
@@ -579,6 +581,7 @@ tBTM_STATUS btm_ble_remove_resolving_list_entry(tBTM_SEC_DEV_REC *p_dev_rec)
                                        BTM_BLE_META_REMOVE_IRK_LEN,
                                        param,
                                        btm_ble_resolving_list_vsc_op_cmpl);
+#endif
     }
 
     if (st == BTM_CMD_STARTED) {
@@ -608,6 +611,7 @@ tBTM_STATUS btm_ble_clear_resolving_list(void)
             st =  BTM_SUCCESS;
         }
     } else {
+#if (0)
         UINT8 param[20] = {0};
         UINT8 *p = param;
 
@@ -616,6 +620,7 @@ tBTM_STATUS btm_ble_clear_resolving_list(void)
                                         BTM_BLE_META_CLEAR_IRK_LEN,
                                         param,
                                         btm_ble_resolving_list_vsc_op_cmpl);
+#endif
     }
 
     return st;
@@ -646,6 +651,7 @@ tBTM_STATUS btm_ble_read_resolving_list_entry(tBTM_SEC_DEV_REC *p_dev_rec)
             st =  BTM_CMD_STARTED;
         }
     } else {
+#if (0)
         UINT8 param[20] = {0};
         UINT8 *p = param;
 
@@ -656,6 +662,7 @@ tBTM_STATUS btm_ble_read_resolving_list_entry(tBTM_SEC_DEV_REC *p_dev_rec)
                                         BTM_BLE_META_READ_IRK_LEN,
                                         param,
                                         btm_ble_resolving_list_vsc_op_cmpl);
+#endif
     }
 
     if (st == BTM_CMD_STARTED) {
@@ -750,6 +757,7 @@ void btm_ble_resume_resolving_list_activity(void)
     p_ble_cb->suspended_rl_state = BTM_BLE_RL_IDLE;
 }
 
+#if (0)
 /*******************************************************************************
 **
 ** Function         btm_ble_vendor_enable_irk_feature
@@ -779,6 +787,7 @@ tBTM_STATUS btm_ble_vendor_enable_irk_feature(BOOLEAN enable)
 
     return st;
 }
+#endif
 
 /*******************************************************************************
 **
@@ -796,7 +805,9 @@ BOOLEAN btm_ble_exe_disable_resolving_list(void)
     }
 
     if (!controller_get_interface()->supports_ble_privacy()) {
+#if (0)
         btm_ble_vendor_enable_irk_feature(FALSE);
+#endif
     } else {
         //btsnd_hcic_ble_set_addr_resolution_enable(FALSE);
     }
@@ -820,7 +831,9 @@ void btm_ble_exe_enable_resolving_list(void)
     }
 
     if (!controller_get_interface()->supports_ble_privacy()) {
+#if (0)
         btm_ble_vendor_enable_irk_feature(TRUE);
+#endif
     } else {
         //btsnd_hcic_ble_set_addr_resolution_enable(TRUE);
     }
@@ -929,6 +942,7 @@ BOOLEAN btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC *p_dev_rec)
 #endif
 
                 } else {
+#if (0)
                     UINT8 param[40] = {0};
                     UINT8 *p = param;
 
@@ -944,6 +958,7 @@ BOOLEAN btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC *p_dev_rec)
                             == BTM_CMD_STARTED) {
                         rt = TRUE;
                     }
+#endif
                 }
 
                 if (rt) {