]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'feature/btdm_bluedroid_env_dynomic_malloc_enable' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Fri, 26 Jan 2018 02:06:43 +0000 (10:06 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Fri, 26 Jan 2018 02:06:43 +0000 (10:06 +0800)
This MR added the bluedroid env  variable can dynamic malloc and BT variable use psram malloc supported

See merge request !1698

1  2 
components/bt/bluedroid/btc/core/btc_main.c

index 84473b58eb9231f23e486271550a7253cd0f4b6d,fd8b037b26d1eca79e19d72ddb934bf42deaa04b..f37801e699edfc0db6024c5d6972f1f66781a2bc
@@@ -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);