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

Merge branch 'change/ble_update_lib_20250919' into 'master'

Browse Source 
change(ble): [AUTO_MR] 20250919 - Update ESP BLE Controller Lib

See merge request espressif/esp-idf!42026
This commit is contained in:
Jiang Jiang Jian
2025-09-20 12:08:37 +08:00
parent 4e4d97fed5 41ecf44cb3
commit c0de85c7a5
10 changed files with 104 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/bt/controller/esp32c2/bt.c
View File

@@ -130,6 +130,15 @@ enum {
};
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
typedef union {
struct {
uint32_t rtc_freq:20;
uint32_t rsv:11;
uint32_t bt_wakeup:1;
};
uint32_t val;
} bt_wakeup_params_t;
/* External functions or variables
************************************************************************
*/
@@ -220,6 +229,9 @@ static void esp_bt_ctrl_log_partition_get_and_erase_first_block(void);
#endif // CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
#endif /* !CONFIG_BT_LE_CONTROLLER_LOG_MODE_BLE_LOG_V2 */
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
static bool esp_bt_check_wakeup_by_bt(void);
#endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
/* Local variable definition
***************************************************************************
*/
@@ -712,6 +724,7 @@ void controller_sleep_cb(uint32_t enable_tick, void *arg)
void controller_wakeup_cb(void *arg)
{
bt_wakeup_params_t *params;
if (s_ble_active) {
return;
}
@@ -721,15 +734,25 @@ void controller_wakeup_cb(void *arg)
esp_pm_get_configuration(&pm_config);
assert(esp_rom_get_cpu_ticks_per_us() == pm_config.max_freq_mhz);
#endif //CONFIG_PM_ENABLE
params = (bt_wakeup_params_t *)arg;
esp_phy_enable(PHY_MODEM_BT);
if (s_bt_lpclk_src == MODEM_CLOCK_LPCLK_SRC_RC_SLOW) {
uint32_t *clk_freq = (uint32_t *)arg;
*clk_freq = esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED) / 5;
params->rtc_freq = esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED) / 5;
}
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
params->bt_wakeup = esp_bt_check_wakeup_by_bt();
#endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
// need to check if need to call pm lock here
s_ble_active = true;
}
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
static bool esp_bt_check_wakeup_by_bt(void)
{
return (esp_sleep_get_wakeup_causes() & ESP_SLEEP_WAKEUP_BT);
}
#endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
esp_err_t controller_sleep_init(modem_clock_lpclk_src_t slow_clk_src)
{
esp_err_t rc = 0;

26
components/bt/controller/esp32c5/bt.c
View File

@@ -117,6 +117,16 @@ enum {
BLE_LOG_INTERFACE_FLAG_END,
};
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
typedef union {
struct {
uint32_t rtc_freq:20;
uint32_t rsv:11;
uint32_t bt_wakeup:1;
};
uint32_t val;
} bt_wakeup_params_t;
/* External functions or variables
************************************************************************
*/
@@ -205,6 +215,9 @@ static void esp_bt_ctrl_log_partition_get_and_erase_first_block(void);
#endif // CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
#endif /* !CONFIG_BT_LE_CONTROLLER_LOG_MODE_BLE_LOG_V2 */
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
static bool esp_bt_check_wakeup_by_bt(void);
#endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
/* Local variable definition
***************************************************************************
*/
@@ -698,6 +711,7 @@ IRAM_ATTR void controller_sleep_cb(uint32_t enable_tick, void *arg)
IRAM_ATTR void controller_wakeup_cb(void *arg)
{
bt_wakeup_params_t *params;
if (s_ble_active) {
return;
}
@@ -708,15 +722,23 @@ IRAM_ATTR void controller_wakeup_cb(void *arg)
assert(esp_rom_get_cpu_ticks_per_us() == pm_config.max_freq_mhz);
r_ble_rtc_wake_up_state_clr();
#endif //CONFIG_PM_ENABLE
params = (bt_wakeup_params_t *)arg;
esp_phy_enable(PHY_MODEM_BT);
if (s_bt_lpclk_src == MODEM_CLOCK_LPCLK_SRC_RC_SLOW) {
uint32_t *clk_freq = (uint32_t *)arg;
*clk_freq = esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED) / 5;
params->rtc_freq = esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED) / 5;
}
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
params->bt_wakeup = esp_bt_check_wakeup_by_bt();
#endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
s_ble_active = true;
}
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
static bool esp_bt_check_wakeup_by_bt(void)
{
return (esp_sleep_get_wakeup_causes() & ESP_SLEEP_WAKEUP_BT);
}
static esp_err_t sleep_modem_ble_mac_retention_init(void *arg)
{
uint8_t size;

25
components/bt/controller/esp32c6/bt.c
View File

@@ -125,6 +125,15 @@ enum {
};
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
typedef union {
struct {
uint32_t rtc_freq:20;
uint32_t rsv:11;
uint32_t bt_wakeup:1;
};
uint32_t val;
} bt_wakeup_params_t;
/* External functions or variables
************************************************************************
*/
@@ -221,6 +230,9 @@ static void esp_bt_ctrl_log_partition_get_and_erase_first_block(void);
#endif // CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
#endif /* !CONFIG_BT_LE_CONTROLLER_LOG_MODE_BLE_LOG_V2 */
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
static bool esp_bt_check_wakeup_by_bt(void);
#endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
/* Local variable definition
***************************************************************************
*/
@@ -759,6 +771,7 @@ IRAM_ATTR void controller_sleep_cb(uint32_t enable_tick, void *arg)
IRAM_ATTR void controller_wakeup_cb(void *arg)
{
bt_wakeup_params_t *params;
if (s_ble_active) {
return;
}
@@ -769,15 +782,23 @@ IRAM_ATTR void controller_wakeup_cb(void *arg)
assert(esp_rom_get_cpu_ticks_per_us() == pm_config.max_freq_mhz);
r_ble_rtc_wake_up_state_clr();
#endif //CONFIG_PM_ENABLE
params = (bt_wakeup_params_t *)arg;
esp_phy_enable(PHY_MODEM_BT);
if (s_bt_lpclk_src == MODEM_CLOCK_LPCLK_SRC_RC_SLOW) {
uint32_t *clk_freq = (uint32_t *)arg;
*clk_freq = esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED) / 5;
params->rtc_freq = esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED) / 5;
}
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
params->bt_wakeup = esp_bt_check_wakeup_by_bt();
#endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
s_ble_active = true;
}
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
static bool esp_bt_check_wakeup_by_bt(void)
{
return (esp_sleep_get_wakeup_causes() & ESP_SLEEP_WAKEUP_BT);
}
static esp_err_t sleep_modem_ble_mac_retention_init(void *arg)
{
uint8_t size;

25
components/bt/controller/esp32h2/bt.c
View File

@@ -117,6 +117,15 @@ enum {
BLE_LOG_INTERFACE_FLAG_END,
};
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
typedef union {
struct {
uint32_t rtc_freq:20;
uint32_t rsv:11;
uint32_t bt_wakeup:1;
};
uint32_t val;
} bt_wakeup_params_t;
/* External functions or variables
************************************************************************
*/
@@ -214,6 +223,9 @@ static void esp_bt_ctrl_log_partition_get_and_erase_first_block(void);
#endif // CONFIG_BT_LE_CONTROLLER_LOG_STORAGE_ENABLE
#endif /* !CONFIG_BT_LE_CONTROLLER_LOG_MODE_BLE_LOG_V2 */
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
static bool esp_bt_check_wakeup_by_bt(void);
#endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
/* Local variable definition
***************************************************************************
*/
@@ -727,6 +739,7 @@ IRAM_ATTR void controller_sleep_cb(uint32_t enable_tick, void *arg)
IRAM_ATTR void controller_wakeup_cb(void *arg)
{
bt_wakeup_params_t *params;
if (s_ble_active) {
return;
}
@@ -737,15 +750,23 @@ IRAM_ATTR void controller_wakeup_cb(void *arg)
assert(esp_rom_get_cpu_ticks_per_us() == pm_config.max_freq_mhz);
r_ble_rtc_wake_up_state_clr();
#endif //CONFIG_PM_ENABLE
params = (bt_wakeup_params_t *)arg;
esp_phy_enable(PHY_MODEM_BT);
if (s_bt_lpclk_src == MODEM_CLOCK_LPCLK_SRC_RC_SLOW) {
uint32_t *clk_freq = (uint32_t *)arg;
*clk_freq = esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED) / 5;
params->rtc_freq = esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED) / 5;
}
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
params->bt_wakeup = esp_bt_check_wakeup_by_bt();
#endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
s_ble_active = true;
}
#ifdef CONFIG_FREERTOS_USE_TICKLESS_IDLE
static bool esp_bt_check_wakeup_by_bt(void)
{
return (esp_sleep_get_wakeup_causes() & ESP_SLEEP_WAKEUP_BT);
}
static esp_err_t sleep_modem_ble_mac_retention_init(void *arg)
{
uint8_t size;

2
components/bt/controller/lib_esp32c2/esp32c2-bt-lib

Submodule components/bt/controller/lib_esp32c2/esp32c2-bt-lib updated: c5a5ba3f0a...2045454453

2
components/bt/controller/lib_esp32c5/esp32c5-bt-lib

Submodule components/bt/controller/lib_esp32c5/esp32c5-bt-lib updated: 805de93b59...cb38f41eb8

2
components/bt/controller/lib_esp32c6/esp32c6-bt-lib

Submodule components/bt/controller/lib_esp32c6/esp32c6-bt-lib updated: 9d2f7a02d1...56d7454a97

2
components/bt/controller/lib_esp32h2/esp32h2-bt-lib

Submodule components/bt/controller/lib_esp32h2/esp32h2-bt-lib updated: 0783414092...a8a87adbd0

8
components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld
View File

@@ -459,7 +459,7 @@ r_ble_ll_resolv_list_clr = 0x4000117c;
r_ble_ll_resolv_list_find = 0x40001180;
r_ble_ll_resolv_list_read_size = 0x40001184;
r_ble_ll_resolv_list_reset = 0x40001188;
r_ble_ll_resolv_list_rmv = 0x4000118c;
//r_ble_ll_resolv_list_rmv = 0x4000118c;
r_ble_ll_resolv_local_addr_rd = 0x40001190;
r_ble_ll_resolv_peer_addr_rd = 0x40001194;
r_ble_ll_resolv_peer_rpa_any = 0x40001198;
@@ -503,7 +503,7 @@ r_ble_ll_scan_have_rxd_scan_rsp = 0x4000122c;
r_ble_ll_scan_init = 0x40001230;
r_ble_ll_scan_initiator_start = 0x40001234;
r_ble_ll_scan_is_inside_window = 0x40001238;
r_ble_ll_scan_move_window_to = 0x4000123c;
//r_ble_ll_scan_move_window_to = 0x4000123c;
r_ble_ll_scan_npl_reset = 0x40001240;
r_ble_ll_scan_parse_auxptr = 0x40001244;
r_ble_ll_scan_parse_ext_hdr = 0x40001248;
@@ -601,9 +601,9 @@ r_ble_ll_utils_csa2_prng = 0x400013b8;
r_ble_ll_utils_remapped_channel = 0x400013bc;
r_ble_ll_whitelist_add = 0x400013c0;
r_ble_ll_whitelist_chg_allowed = 0x400013c4;
r_ble_ll_whitelist_clear = 0x400013c8;
//r_ble_ll_whitelist_clear = 0x400013c8;
r_ble_ll_whitelist_read_size = 0x400013cc;
r_ble_ll_whitelist_rmv = 0x400013d0;
//r_ble_ll_whitelist_rmv = 0x400013d0;
r_ble_ll_whitelist_search = 0x400013d4;
r_ble_ll_write_rf_path_compensation = 0x400013d8;
r_ble_lll_adv_aux_scannable_pdu_payload_len = 0x400013dc;

2
components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld
View File

@@ -408,7 +408,7 @@ r_ble_ll_scan_get_peer_rpa = 0x40001228;
r_ble_ll_scan_have_rxd_scan_rsp = 0x4000122c;
r_ble_ll_scan_initiator_start = 0x40001234;
r_ble_ll_scan_is_inside_window = 0x40001238;
r_ble_ll_scan_move_window_to = 0x4000123c;
//r_ble_ll_scan_move_window_to = 0x4000123c;
r_ble_ll_scan_npl_reset = 0x40001240;
r_ble_ll_scan_parse_auxptr = 0x40001244;
r_ble_ll_scan_parse_ext_hdr = 0x40001248;