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

fix bta_dm_deinit_cb crash

Browse Source
This commit is contained in:
wangcheng
2020-05-13 20:11:57 +08:00
parent 456c8bdbdf
commit d231b25bc4
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/bt/host/bluedroid/bta/dm/bta_dm_act.c
View File

@ -334,6 +334,9 @@ void bta_dm_deinit_cb(void)
} }
#endif #endif
memset(&bta_dm_cb, 0, sizeof(bta_dm_cb)); memset(&bta_dm_cb, 0, sizeof(bta_dm_cb));
#if BTA_DYNAMIC_MEMORY
xSemaphoreGive(deinit_semaphore);
#endif /* #if BTA_DYNAMIC_MEMORY */
} }
/******************************************************************************* /*******************************************************************************

3
components/bt/host/bluedroid/bta/dm/include/bta_dm_int.h
View File

@ -25,7 +25,7 @@
#define BTA_DM_INT_H #define BTA_DM_INT_H
#include "common/bt_target.h" #include "common/bt_target.h"
#include "freertos/semphr.h"
#if (BLE_INCLUDED == TRUE && (defined BTA_GATT_INCLUDED) && (BTA_GATT_INCLUDED == TRUE)) #if (BLE_INCLUDED == TRUE && (defined BTA_GATT_INCLUDED) && (BTA_GATT_INCLUDED == TRUE))
#include "bta/bta_gatt_api.h" #include "bta/bta_gatt_api.h"
#endif #endif
@ -1236,6 +1236,7 @@ extern tBTA_DM_DI_CB bta_dm_di_cb;
#else #else
extern tBTA_DM_DI_CB *bta_dm_di_cb_ptr; extern tBTA_DM_DI_CB *bta_dm_di_cb_ptr;
#define bta_dm_di_cb (*bta_dm_di_cb_ptr) #define bta_dm_di_cb (*bta_dm_di_cb_ptr)
SemaphoreHandle_t deinit_semaphore;
#endif #endif
#if BTA_DYNAMIC_MEMORY == FALSE #if BTA_DYNAMIC_MEMORY == FALSE

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

@ -70,11 +70,18 @@ static void btc_init_bluetooth(void)
btc_dm_load_ble_local_keys(); btc_dm_load_ble_local_keys();
#endif ///BLE_INCLUDED == TRUE #endif ///BLE_INCLUDED == TRUE
#endif /* #if (SMP_INCLUDED) */ #endif /* #if (SMP_INCLUDED) */
#if BTA_DYNAMIC_MEMORY
deinit_semaphore = xSemaphoreCreateBinary();
#endif /* #if BTA_DYNAMIC_MEMORY */
} }
static void btc_deinit_bluetooth(void) static void btc_deinit_bluetooth(void)
{ {
/* Wait for the disable operation to complete */
#if BTA_DYNAMIC_MEMORY
xSemaphoreTake(deinit_semaphore, BTA_DISABLE_DELAY / portTICK_PERIOD_MS);
#endif /* #if BTA_DYNAMIC_MEMORY */
#if (BLE_INCLUDED == TRUE) #if (BLE_INCLUDED == TRUE)
btc_gap_ble_deinit(); btc_gap_ble_deinit();
#endif ///BLE_INCLUDED == TRUE #endif ///BLE_INCLUDED == TRUE
@ -92,6 +99,10 @@ static void btc_deinit_bluetooth(void)
osi_alarm_deinit(); osi_alarm_deinit();
osi_alarm_delete_mux(); osi_alarm_delete_mux();
future_ready(*btc_main_get_future_p(BTC_MAIN_DEINIT_FUTURE), FUTURE_SUCCESS); future_ready(*btc_main_get_future_p(BTC_MAIN_DEINIT_FUTURE), FUTURE_SUCCESS);
#if BTA_DYNAMIC_MEMORY
vSemaphoreDelete(deinit_semaphore);
deinit_semaphore = NULL;
#endif /* #if BTA_DYNAMIC_MEMORY */
} }
void btc_main_call_handler(btc_msg_t *msg) void btc_main_call_handler(btc_msg_t *msg)