alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feat/get_ble_resolve_address_status_v5.2' into 'release/v5.2'

Browse Source 
feat(ble/bluedroid): Support resolve BLE address for interval usage (v5.2)

See merge request espressif/esp-idf!33807
This commit is contained in:
Island 2024-09-29 10:30:04 +08:00
commit 601e35c926
7 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/bt/controller/esp32/bt.c
View File

@ -1634,7 +1634,10 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
btdm_cfg_mask = btdm_config_mask_load(); btdm_cfg_mask = btdm_config_mask_load();
if (btdm_controller_init(btdm_cfg_mask, cfg) != 0) { err = btdm_controller_init(btdm_cfg_mask, cfg);
if (err != 0) {
ESP_LOGE(BTDM_LOG_TAG, "%s %d\n",__func__,err);
err = ESP_ERR_NO_MEM; err = ESP_ERR_NO_MEM;
goto error; goto error;
} }

5
components/bt/controller/esp32c3/bt.c
View File

@ -1433,7 +1433,10 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
periph_module_enable(PERIPH_BT_MODULE); periph_module_enable(PERIPH_BT_MODULE);
periph_module_reset(PERIPH_BT_MODULE); periph_module_reset(PERIPH_BT_MODULE);
if (btdm_controller_init(cfg) != 0) { err = btdm_controller_init(cfg);
if (err != 0) {
ESP_LOGE(BT_LOG_TAG, "%s %d\n",__func__,err);
err = ESP_ERR_NO_MEM; err = ESP_ERR_NO_MEM;
goto error; goto error;
} }

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

@ -66,7 +66,7 @@ config BT_A2DP_ENABLE
depends on BT_CLASSIC_ENABLED depends on BT_CLASSIC_ENABLED
default n default n
help help
Advanced Audio Distrubution Profile Advanced Audio Distribution Profile
config BT_SPP_ENABLED config BT_SPP_ENABLED
bool "SPP" bool "SPP"
@ -121,7 +121,7 @@ config BT_HFP_WBS_ENABLE
default y default y
help help
This enables Wide Band Speech. Should disable it when SCO data path is PCM. This enables Wide Band Speech. Should disable it when SCO data path is PCM.
Otherwise there will be no data transmited via GPIOs. Otherwise there will be no data transmitted via GPIOs.
menuconfig BT_HID_ENABLED menuconfig BT_HID_ENABLED
@ -1064,7 +1064,7 @@ config BT_ACL_CONNECTIONS
is used. is used.
config BT_MULTI_CONNECTION_ENBALE config BT_MULTI_CONNECTION_ENBALE
bool "Enable BLE multi-conections" bool "Enable BLE multi-connections"
depends on BT_BLE_ENABLED depends on BT_BLE_ENABLED
default y default y
help help

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

@ -141,6 +141,12 @@ uint32_t btc_get_ble_status(void)
status |= BIT(BTC_BLE_STATUS_CONN); status |= BIT(BTC_BLE_STATUS_CONN);
} }
// Address resolve status
extern uint8_t btm_get_ble_addr_resolve_disable_status(void);
if (btm_get_ble_addr_resolve_disable_status()) {
status |= BIT(BTC_BLE_STATUS_ADDR_RESOLVE_DISABLE);
}
#if (SMP_INCLUDED == TRUE) #if (SMP_INCLUDED == TRUE)
// Number of recorded devices // Number of recorded devices
extern uint8_t btm_ble_sec_dev_active_count(void); extern uint8_t btm_ble_sec_dev_active_count(void);

1
components/bt/host/bluedroid/btc/include/btc/btc_main.h
View File

@ -40,6 +40,7 @@ typedef enum {
BTC_BLE_STATUS_GATTC_APP, // GATTC application exist BTC_BLE_STATUS_GATTC_APP, // GATTC application exist
BTC_BLE_STATUS_GATTS_SRVC, // GATTS service exist BTC_BLE_STATUS_GATTS_SRVC, // GATTS service exist
BTC_BLE_STATUS_PRIVACY, // Privacy enabled BTC_BLE_STATUS_PRIVACY, // Privacy enabled
BTC_BLE_STATUS_ADDR_RESOLVE_DISABLE,// Address resolution disable status
} tBTC_BLE_STATUS; } tBTC_BLE_STATUS;
future_t **btc_main_get_future_p(btc_main_future_type_t type); future_t **btc_main_get_future_p(btc_main_future_type_t type);

6
components/bt/host/bluedroid/hci/packet_fragmenter.c
View File

@ -171,6 +171,12 @@ static void reassemble_and_dispatch(BT_HDR *packet)
return; return;
} }
partial_packet = (BT_HDR *)osi_calloc(full_length + sizeof(BT_HDR)); partial_packet = (BT_HDR *)osi_calloc(full_length + sizeof(BT_HDR));
if (partial_packet == NULL) {
HCI_TRACE_WARNING("%s full_length %d no memory.\n", __func__, full_length);
assert(0);
}
partial_packet->event = packet->event; partial_packet->event = packet->event;
partial_packet->len = full_length; partial_packet->len = full_length;
partial_packet->offset = packet->len; partial_packet->offset = packet->len;

10
components/bt/host/bluedroid/stack/btm/btm_main.c
View File

@ -134,10 +134,16 @@ uint8_t btm_acl_active_count(void)
return count; return count;
} }
#if (BLE_INCLUDED == TRUE)
// Address resolution status
uint8_t btm_get_ble_addr_resolve_disable_status(void)
{
// Returns false if address resolution is enabled, true if disabled
return (btm_cb.addr_res_en) ? 0 : 1;
}
void btm_ble_addr_resolve_enable(bool enable) void btm_ble_addr_resolve_enable(bool enable)
{ {
#if (BLE_INCLUDED == TRUE)
btm_cb.addr_res_en = enable; btm_cb.addr_res_en = enable;
#endif
} }
#endif /*BLE_INCLUDED*/