espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/btdm_esp32_add_local_irk_to_controller_v4.3' into 'release/v4.3'

Browse Source 
component/bt: add local irk to controller

See merge request espressif/esp-idf!14667
This commit is contained in:
Jiang Jiang Jian
2021-08-10 03:49:11 +00:00
parent 0423027d5d 032f6d34d1
commit 9b8cdf9e87
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/bt/host/bluedroid/common/include/common/bt_target.h
View File

@ -258,10 +258,10 @@
#define BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT UC_BT_BLE_ESTAB_LINK_CONN_TOUT
#endif
#if (SOC_BLE_UPDATE_OWN_RPA)
#define BLE_UPDATE_BLE_ADDR_TYPE_RPA TRUE
#else
#ifdef SOC_BLE_DONT_UPDATE_OWN_RPA
#define BLE_UPDATE_BLE_ADDR_TYPE_RPA FALSE
#else
#define BLE_UPDATE_BLE_ADDR_TYPE_RPA TRUE
#endif
//------------------Added from bdroid_buildcfg.h---------------------
#ifndef L2CAP_EXTFEA_SUPPORTED_MASK

6
components/bt/host/bluedroid/stack/btm/btm_sec.c
View File

@ -240,6 +240,12 @@ BOOLEAN BTM_SecRegister(tBTM_APPL_INFO *p_cb_info)
if (memcmp(btm_cb.devcb.id_keys.ir, &temp_value, sizeof(BT_OCTET16)) == 0) {
btm_ble_reset_id();
}
#if (!BLE_UPDATE_BLE_ADDR_TYPE_RPA)
BD_ADDR peer_addr = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
BT_OCTET16 peer_irk = {0x0};
/* add local irk to controller */
btsnd_hcic_ble_add_device_resolving_list (BLE_ADDR_PUBLIC, peer_addr, peer_irk, btm_cb.devcb.id_keys.irk);
#endif
} else {
BTM_TRACE_WARNING("%s p_cb_info->p_le_callback == NULL\n", __func__);
}

2
components/soc/esp32/include/soc/soc_caps.h
View File

@ -277,4 +277,4 @@
#endif
/*------------------------------ BLE --------------------------------------------*/
#define SOC_BLE_UPDATE_OWN_RPA (0)
#define SOC_BLE_DONT_UPDATE_OWN_RPA (1)

3
components/soc/esp32c3/include/soc/soc_caps.h
View File

@ -267,6 +267,3 @@
#define SOC_PM_SUPPORT_WIFI_PD (1)
#define SOC_PM_SUPPORT_BT_PD (1)
/*------------------------------ BLE --------------------------------------------*/
#define SOC_BLE_UPDATE_OWN_RPA (1)

3
components/soc/esp32s3/include/soc/soc_caps.h
View File

@ -182,6 +182,3 @@
#define SOC_SPI_MEM_SUPPORT_SW_SUSPEND (1)
/*-------------------------- COEXISTENCE HARDWARE PTI CAPS -------------------------------*/
#define SOC_COEX_HW_PTI (1)
/*------------------------------ BLE --------------------------------------------*/
#define SOC_BLE_UPDATE_OWN_RPA (1)