feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

component/bt : change the resolving list cleanup position

Browse Source 
1. enable will malloc, but disable don't free resolving list, so fix it
2. In disable procedure, it will alloc alarm to hash_map, and all the alarm  hash_map will be free in deinit. So this need not be fixed currently.
This commit is contained in:
Tian Hao
2016-12-15 13:35:30 +08:00
parent aba262b18b
commit d045187c0f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/bluedroid/bta/dm/bta_dm_act.c
View File

@@ -431,6 +431,10 @@ void bta_dm_disable (tBTA_DM_MSG *p_data)
bta_sys_start_timer(&bta_dm_cb.disable_timer, 0, 5000); bta_sys_start_timer(&bta_dm_cb.disable_timer, 0, 5000);
} }
#if BLE_PRIVACY_SPT == TRUE
btm_ble_resolving_list_cleanup (); //by TH, because cmn_ble_vsc_cb.max_filter has something mistake as btm_ble_adv_filter_cleanup
#endif
} }
/******************************************************************************* /*******************************************************************************

4
components/bt/bluedroid/bta/dm/bta_dm_api.c
View File

@@ -2170,10 +2170,6 @@ void BTA_VendorCleanup (void)
#if (BLE_INCLUDED == TRUE && BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE) #if (BLE_INCLUDED == TRUE && BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE)
btm_ble_adv_filter_cleanup(); // when BLE_VND_INCLUDED is false, this function will be ignore, so move it out of "if" btm_ble_adv_filter_cleanup(); // when BLE_VND_INCLUDED is false, this function will be ignore, so move it out of "if"
#if BLE_PRIVACY_SPT == TRUE
btm_ble_resolving_list_cleanup (); //by TH, because cmn_ble_vsc_cb.max_filter has something mistake as btm_ble_adv_filter_cleanup
#endif
#if 0 //by TH, comment out temporarily #if 0 //by TH, comment out temporarily
if (cmn_ble_vsc_cb.max_filter > 0) { if (cmn_ble_vsc_cb.max_filter > 0) {
btm_ble_adv_filter_cleanup(); btm_ble_adv_filter_cleanup();