espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_some_ble_build_fail_v5.4' into 'release/v5.4'

Browse Source 
fix(ble/bluedroid): fix build failure when some BLE features are disabled (v5.4)

See merge request espressif/esp-idf!40130
This commit is contained in:
Island
2025-07-02 15:53:12 +08:00
parent b3269af4d0 096acfc67c
commit e6c334cbb9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/bt/host/bluedroid/Kconfig.in
View File

@@ -1262,7 +1262,7 @@ config BT_BLE_50_EXTEND_ADV_EN
config BT_BLE_50_PERIODIC_ADV_EN config BT_BLE_50_PERIODIC_ADV_EN
bool "Enable BLE periodic advertising" bool "Enable BLE periodic advertising"
depends on BT_BLE_50_FEATURES_SUPPORTED depends on BT_BLE_50_EXTEND_ADV_EN
default y default y
help help
This enables BLE periodic advertising This enables BLE periodic advertising
@@ -1276,7 +1276,7 @@ config BT_BLE_50_EXTEND_SCAN_EN
config BT_BLE_50_EXTEND_SYNC_EN config BT_BLE_50_EXTEND_SYNC_EN
bool "Enable BLE periodic advertising sync" bool "Enable BLE periodic advertising sync"
depends on BT_BLE_50_FEATURES_SUPPORTED depends on BT_BLE_50_EXTEND_SCAN_EN
default y default y
help help
This enables BLE periodic advertising sync This enables BLE periodic advertising sync
@@ -1290,21 +1290,21 @@ config BT_BLE_50_DTM_TEST_EN
config BT_BLE_FEAT_PERIODIC_ADV_SYNC_TRANSFER config BT_BLE_FEAT_PERIODIC_ADV_SYNC_TRANSFER
bool "Enable BLE periodic advertising sync transfer feature" bool "Enable BLE periodic advertising sync transfer feature"
depends on (BT_BLUEDROID_ENABLED && BT_BLE_50_FEATURES_SUPPORTED && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR depends on (BT_BLUEDROID_ENABLED && BT_BLE_50_PERIODIC_ADV_EN && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR
default n default n
help help
This enables BLE periodic advertising sync transfer feature This enables BLE periodic advertising sync transfer feature
config BT_BLE_FEAT_PERIODIC_ADV_ENH config BT_BLE_FEAT_PERIODIC_ADV_ENH
bool "Enable periodic adv enhancements(adi support)" bool "Enable periodic adv enhancements(adi support)"
depends on (BT_BLUEDROID_ENABLED && BT_BLE_50_FEATURES_SUPPORTED && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR depends on (BT_BLUEDROID_ENABLED && BT_BLE_50_PERIODIC_ADV_EN && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR
default n default n
help help
Enable the periodic advertising enhancements Enable the periodic advertising enhancements
config BT_BLE_FEAT_CREATE_SYNC_ENH config BT_BLE_FEAT_CREATE_SYNC_ENH
bool "Enable create sync enhancements(reporting disable and duplicate filtering enable support)" bool "Enable create sync enhancements(reporting disable and duplicate filtering enable support)"
depends on (BT_BLUEDROID_ENABLED && BT_BLE_50_FEATURES_SUPPORTED && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR depends on (BT_BLUEDROID_ENABLED && BT_BLE_50_EXTEND_SYNC_EN && ((BT_CONTROLLER_ENABLED && SOC_ESP_NIMBLE_CONTROLLER) || BT_CONTROLLER_DISABLED)) # NOERROR
default n default n
help help
Enable the create sync enhancements Enable the create sync enhancements

4
components/bt/host/bluedroid/api/esp_gap_ble_api.c
View File

@@ -442,7 +442,7 @@ esp_err_t esp_ble_gap_get_local_used_addr(esp_bd_addr_t local_used_addr, uint8_t
} }
return ESP_OK; 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) 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) { if (length == NULL) {
@@ -473,7 +473,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); 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_FEATURE_SUPPORT == TRUE)
#if (BLE_42_ADV_EN == 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) esp_err_t esp_ble_gap_config_adv_data_raw(uint8_t *raw_data, uint32_t raw_data_len)

2
components/bt/host/bluedroid/btc/core/btc_main.c
View File

@@ -174,7 +174,7 @@ uint32_t btc_get_ble_status(void)
#endif #endif
#endif #endif
#if (BLE_50_FEATURE_SUPPORT == TRUE) #if (BLE_50_EXTEND_ADV_EN == TRUE)
// Number of active extended advertsing // Number of active extended advertsing
extern uint8_t btm_ble_ext_adv_active_count(void); extern uint8_t btm_ble_ext_adv_active_count(void);
if (btm_ble_ext_adv_active_count()) { if (btm_ble_ext_adv_active_count()) {