From c038e38c2481ebfd6cecdf4d3b1c5db8ae1e5d24 Mon Sep 17 00:00:00 2001 From: zwl Date: Wed, 21 Aug 2024 10:07:09 +0800 Subject: [PATCH 1/3] fix(ble): fixed ble controller issues on ESP32-C6 --- components/bt/controller/esp32c6/bt.c | 4 ++-- components/bt/controller/lib_esp32c6/esp32c6-bt-lib | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/bt/controller/esp32c6/bt.c b/components/bt/controller/esp32c6/bt.c index a9424513b212..42792818c992 100644 --- a/components/bt/controller/esp32c6/bt.c +++ b/components/bt/controller/esp32c6/bt.c @@ -134,7 +134,7 @@ extern void r_ble_rtc_wake_up_state_clr(void); extern int os_msys_init(void); extern void os_msys_deinit(void); #if CONFIG_FREERTOS_USE_TICKLESS_IDLE -extern const sleep_retention_entries_config_t *esp_ble_mac_retention_link_get(uint8_t *size, uint8_t extra); +extern sleep_retention_entries_config_t *r_esp_ble_mac_retention_link_get(uint8_t *size, uint8_t extra); extern void r_esp_ble_set_wakeup_overhead(uint32_t overhead); #endif /* CONFIG_FREERTOS_USE_TICKLESS_IDLE */ extern void r_esp_ble_change_rtc_freq(uint32_t freq); @@ -569,7 +569,7 @@ static esp_err_t sleep_modem_ble_mac_retention_init(void *arg) { uint8_t size; int extra = *(int *)arg; - const sleep_retention_entries_config_t *ble_mac_modem_config = esp_ble_mac_retention_link_get(&size, extra); + sleep_retention_entries_config_t *ble_mac_modem_config = r_esp_ble_mac_retention_link_get(&size, extra); esp_err_t err = sleep_retention_entries_create(ble_mac_modem_config, size, REGDMA_LINK_PRI_BT_MAC_BB, SLEEP_RETENTION_MODULE_BLE_MAC); if (err == ESP_OK) { ESP_LOGI(NIMBLE_PORT_LOG_TAG, "Modem BLE MAC retention initialization"); diff --git a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib index aa8d03a0ff51..f95513f22be7 160000 --- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib +++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib @@ -1 +1 @@ -Subproject commit aa8d03a0ff51c166267207e54002613bcedc576e +Subproject commit f95513f22be7b21429b01ba05dbfbc98097b5e67 From e8c80d480988d3e699532d58d4e01b4d5a2d3460 Mon Sep 17 00:00:00 2001 From: zwl Date: Wed, 21 Aug 2024 10:10:22 +0800 Subject: [PATCH 2/3] fix(ble): fixed ble controller issues on ESP32-H2 --- components/bt/controller/esp32h2/bt.c | 4 ++-- components/bt/controller/lib_esp32h2/esp32h2-bt-lib | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/bt/controller/esp32h2/bt.c b/components/bt/controller/esp32h2/bt.c index 362e7ead09d0..a9489fbe92d9 100644 --- a/components/bt/controller/esp32h2/bt.c +++ b/components/bt/controller/esp32h2/bt.c @@ -126,7 +126,7 @@ extern void r_ble_rtc_wake_up_state_clr(void); extern int os_msys_init(void); extern void os_msys_deinit(void); #if CONFIG_FREERTOS_USE_TICKLESS_IDLE -extern const sleep_retention_entries_config_t *esp_ble_mac_retention_link_get(uint8_t *size, uint8_t extra); +extern sleep_retention_entries_config_t *r_esp_ble_mac_retention_link_get(uint8_t *size, uint8_t extra); extern void r_esp_ble_set_wakeup_overhead(uint32_t overhead); #endif /* CONFIG_FREERTOS_USE_TICKLESS_IDLE */ extern void r_esp_ble_change_rtc_freq(uint32_t freq); @@ -555,7 +555,7 @@ static esp_err_t sleep_modem_ble_mac_retention_init(void *arg) { uint8_t size; int extra = *(int *)arg; - const sleep_retention_entries_config_t *ble_mac_modem_config = esp_ble_mac_retention_link_get(&size, extra); + sleep_retention_entries_config_t *ble_mac_modem_config = r_esp_ble_mac_retention_link_get(&size, extra); esp_err_t err = sleep_retention_entries_create(ble_mac_modem_config, size, REGDMA_LINK_PRI_BT_MAC_BB, SLEEP_RETENTION_MODULE_BLE_MAC); if (err == ESP_OK) { ESP_LOGI(NIMBLE_PORT_LOG_TAG, "Modem BLE MAC retention initialization"); diff --git a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib index 1db0566dcdf5..58a293a2b4c3 160000 --- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib +++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib @@ -1 +1 @@ -Subproject commit 1db0566dcdf5a0bd69632415f6dd148ab2ea0ac6 +Subproject commit 58a293a2b4c305157723908ea29c2776f5803bbc From 8c3e2c9d5a75ab1603168f347be84ea0cfa9e0a1 Mon Sep 17 00:00:00 2001 From: zwl Date: Wed, 21 Aug 2024 10:15:42 +0800 Subject: [PATCH 3/3] fix(ble): fixed ble controller issues on ESP32-C2 --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index db84a7e4539c..e65262475034 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit db84a7e4539c5d9e6b8ec882b82a5de0fb8400c7 +Subproject commit e652624750341aca124e9f850e261b0c1ac63529