From: Jiang Jiang Jian Date: Fri, 26 Jan 2018 02:06:43 +0000 (+0800) Subject: Merge branch 'feature/btdm_bluedroid_env_dynomic_malloc_enable' into 'master' X-Git-Tag: v3.1-beta1~445 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b1f8698807679d627948d754b2af4e1165bfcd2;p=esp-idf Merge branch 'feature/btdm_bluedroid_env_dynomic_malloc_enable' into 'master' This MR added the bluedroid env variable can dynamic malloc and BT variable use psram malloc supported See merge request !1698 --- 5b1f8698807679d627948d754b2af4e1165bfcd2 diff --cc components/bt/bluedroid/btc/core/btc_main.c index 84473b58eb,fd8b037b26..f37801e699 --- a/components/bt/bluedroid/btc/core/btc_main.c +++ b/components/bt/bluedroid/btc/core/btc_main.c @@@ -67,10 -71,16 +71,18 @@@ static void btc_init_bluetooth(void static void btc_deinit_bluetooth(void) { + btc_gap_ble_deinit(); + bta_dm_sm_deinit(); + #if (GATTC_INCLUDED) + bta_gattc_deinit(); + #endif /* #if (GATTC_INCLUDED) */ + #if (GATTS_INCLUDED) + bta_gatts_deinit(); + #endif /* #if (GATTS_INCLUDED) */ bte_main_shutdown(); +#if (SMP_INCLUDED) btc_config_clean_up(); +#endif osi_alarm_deinit(); osi_alarm_delete_mux(); future_ready(*btc_main_get_future_p(BTC_MAIN_DEINIT_FUTURE), FUTURE_SUCCESS);