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

ble(fix): Fixed the issue of not returning memory to the memory pool after deinit callout

Browse Source 
ble(fix): Fixed the issue of not returning memory to the memory pool after deinit callout
This commit is contained in:
luomanruo 2023-11-06 10:45:50 +08:00
parent baf1091868
commit ec119aa694
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -719,10 +719,10 @@ esp_err_t esp_bt_controller_deinit(void)
controller_sleep_deinit(); controller_sleep_deinit();
ble_controller_deinit();
#if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED #if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
ble_log_deinit_async(); ble_log_deinit_async();
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED #endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
ble_controller_deinit();
periph_module_disable(PERIPH_BT_MODULE); periph_module_disable(PERIPH_BT_MODULE);

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

@ -861,10 +861,10 @@ esp_err_t esp_bt_controller_deinit(void)
modem_clock_deselect_lp_clock_source(PERIPH_BT_MODULE); modem_clock_deselect_lp_clock_source(PERIPH_BT_MODULE);
modem_clock_module_disable(PERIPH_BT_MODULE); modem_clock_module_disable(PERIPH_BT_MODULE);
ble_controller_deinit();
#if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED #if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
ble_log_deinit_async(); ble_log_deinit_async();
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED #endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
ble_controller_deinit();
#if CONFIG_BT_NIMBLE_ENABLED #if CONFIG_BT_NIMBLE_ENABLED
/* De-initialize default event queue */ /* De-initialize default event queue */

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

@ -840,10 +840,10 @@ esp_err_t esp_bt_controller_deinit(void)
modem_clock_deselect_lp_clock_source(PERIPH_BT_MODULE); modem_clock_deselect_lp_clock_source(PERIPH_BT_MODULE);
modem_clock_module_disable(PERIPH_BT_MODULE); modem_clock_module_disable(PERIPH_BT_MODULE);
ble_controller_deinit();
#if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED #if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
ble_log_deinit_async(); ble_log_deinit_async();
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED #endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
ble_controller_deinit();
#if CONFIG_BT_NIMBLE_ENABLED #if CONFIG_BT_NIMBLE_ENABLED
/* De-initialize default event queue */ /* De-initialize default event queue */

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

@ -1 +1 @@
Subproject commit ea33fbad1fa0879fe0e118359d20463b3e2f126b Subproject commit 11c11f187fc349df8494305c7b308b4d7783d762

2
components/bt/porting/npl/freertos/src/npl_os_freertos.c
View File

@ -720,12 +720,12 @@ npl_freertos_callout_deinit(struct ble_npl_callout *co)
} }
#else #else
xTimerDelete(callout->handle, portMAX_DELAY); xTimerDelete(callout->handle, portMAX_DELAY);
#endif // BLE_NPL_USE_ESP_TIMER
#if OS_MEM_ALLOC #if OS_MEM_ALLOC
os_memblock_put(&ble_freertos_co_pool,callout); os_memblock_put(&ble_freertos_co_pool,callout);
#else #else
free((void *)callout); free((void *)callout);
#endif // OS_MEM_ALLOC #endif // OS_MEM_ALLOC
#endif // BLE_NPL_USE_ESP_TIMER
co->co = NULL; co->co = NULL;
memset(co, 0, sizeof(struct ble_npl_callout)); memset(co, 0, sizeof(struct ble_npl_callout));
} }