From 89dfe99648a153087c937554b6e815c6dcf16c50 Mon Sep 17 00:00:00 2001
From: zhanghaipeng <zhanghaipeng@espressif.com>
Date: Tue, 24 Jun 2025 19:26:55 +0800
Subject: [PATCH] fix(ble/bluedroid): fix build failure when some BLE features
 are disabled

---
 components/bt/host/bluedroid/Kconfig.in            | 10 +++++-----
 components/bt/host/bluedroid/api/esp_gap_ble_api.c |  4 ++--
 components/bt/host/bluedroid/btc/core/btc_main.c   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/bt/host/bluedroid/Kconfig.in b/components/bt/host/bluedroid/Kconfig.in
index 704d932c00..fb0c34f81b 100644
--- a/components/bt/host/bluedroid/Kconfig.in
+++ b/components/bt/host/bluedroid/Kconfig.in
@@ -1180,7 +1180,7 @@ config BT_BLE_50_EXTEND_ADV_EN
 
 config BT_BLE_50_PERIODIC_ADV_EN
     bool "Enable BLE periodic advertising"
-    depends on BT_BLE_50_FEATURES_SUPPORTED
+    depends on BT_BLE_50_EXTEND_ADV_EN
     default y
     help
         This enables BLE periodic advertising
@@ -1194,7 +1194,7 @@ config BT_BLE_50_EXTEND_SCAN_EN
 
 config BT_BLE_50_EXTEND_SYNC_EN
     bool "Enable BLE periodic advertising sync"
-    depends on BT_BLE_50_FEATURES_SUPPORTED
+    depends on BT_BLE_50_EXTEND_SCAN_EN
     default y
     help
         This enables BLE periodic advertising sync
@@ -1208,21 +1208,21 @@ config BT_BLE_50_DTM_TEST_EN
 
 config BT_BLE_FEAT_PERIODIC_ADV_SYNC_TRANSFER
     bool "Enable BLE periodic advertising sync transfer feature"
-    depends on (BT_BLE_50_FEATURES_SUPPORTED && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR
+    depends on (BT_BLE_50_PERIODIC_ADV_EN && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR
     default n
     help
         This enables BLE periodic advertising sync transfer feature
 
 config BT_BLE_FEAT_PERIODIC_ADV_ENH
     bool "Enable periodic adv enhancements(adi support)"
-    depends on (BT_BLE_50_FEATURES_SUPPORTED && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR
+    depends on (BT_BLE_50_PERIODIC_ADV_EN && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR
     default n
     help
         Enable the periodic advertising enhancements
 
 config BT_BLE_FEAT_CREATE_SYNC_ENH
     bool "Enable create sync enhancements(reporting disable and duplicate filtering enable support)"
-    depends on (BT_BLE_50_FEATURES_SUPPORTED && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR
+    depends on (BT_BLE_50_EXTEND_SYNC_EN && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR
     default n
     help
         Enable the create sync enhancements
diff --git a/components/bt/host/bluedroid/api/esp_gap_ble_api.c b/components/bt/host/bluedroid/api/esp_gap_ble_api.c
index a4262fd017..5cd266eaa8 100644
--- a/components/bt/host/bluedroid/api/esp_gap_ble_api.c
+++ b/components/bt/host/bluedroid/api/esp_gap_ble_api.c
@@ -429,7 +429,7 @@ esp_err_t esp_ble_gap_get_local_used_addr(esp_bd_addr_t local_used_addr, uint8_t
     }
     return ESP_OK;
 }
-
+#if ((BLE_42_SCAN_EN == TRUE) || (BLE_50_EXTEND_SCAN_EN == TRUE))
 uint8_t *esp_ble_resolve_adv_data_by_type( uint8_t *adv_data, uint16_t adv_data_len, esp_ble_adv_data_type type, uint8_t *length)
 {
     if (length == NULL) {
@@ -460,7 +460,7 @@ uint8_t *esp_ble_resolve_adv_data( uint8_t *adv_data, uint8_t type, uint8_t *len
 {
     return esp_ble_resolve_adv_data_by_type( adv_data, ESP_BLE_ADV_DATA_LEN_MAX + ESP_BLE_SCAN_RSP_DATA_LEN_MAX, (esp_ble_adv_data_type) type, length);
 }
-
+#endif // #if ((BLE_42_SCAN_EN == TRUE) || (BLE_50_EXTEND_SCAN_EN == TRUE))
 #if (BLE_42_FEATURE_SUPPORT == TRUE)
 #if (BLE_42_ADV_EN == TRUE)
 esp_err_t esp_ble_gap_config_adv_data_raw(uint8_t *raw_data, uint32_t raw_data_len)
diff --git a/components/bt/host/bluedroid/btc/core/btc_main.c b/components/bt/host/bluedroid/btc/core/btc_main.c
index cee4c251fa..d7330cc6f7 100644
--- a/components/bt/host/bluedroid/btc/core/btc_main.c
+++ b/components/bt/host/bluedroid/btc/core/btc_main.c
@@ -186,7 +186,7 @@ uint32_t btc_get_ble_status(void)
     #endif
     #endif
 
-    #if (BLE_50_FEATURE_SUPPORT == TRUE)
+    #if (BLE_50_EXTEND_ADV_EN == TRUE)
     // Number of active extended advertsing
     extern uint8_t btm_ble_ext_adv_active_count(void);
     if (btm_ble_ext_adv_active_count()) {