From: wangmengyang <wangmengyang@espressif.com>
Date: Thu, 6 Apr 2017 06:59:58 +0000 (+0800)
Subject: Merge branch 'master' into feature/btdm_avrc
X-Git-Tag: v2.1-rc1~196^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbd4e0522e65f1e0702fc4b0e99bfd747e792423;p=esp-idf

Merge branch 'master' into feature/btdm_avrc
---

dbd4e0522e65f1e0702fc4b0e99bfd747e792423
diff --cc components/bt/bluedroid/btc/core/btc_main.c
index 9181b6ab2a,8394c8a44d..d251782e40
--- a/components/bt/bluedroid/btc/core/btc_main.c
+++ b/components/bt/bluedroid/btc/core/btc_main.c
@@@ -14,10 -14,9 +14,11 @@@
  
  #include "btc_task.h"
  #include "btc_main.h"
 +#include "btc_dm.h"
  #include "future.h"
  #include "esp_err.h"
 +#include "btc_config.h"
+ #include "alarm.h"
  
  static future_t *main_future[BTC_MAIN_FUTURE_NUM];
  
@@@ -51,7 -61,8 +52,9 @@@ void btc_init_callback(void
  
  static void btc_init_bluetooth(void)
  {
+     osi_alarm_create_mux();
+     osi_alarm_init();
 +    btc_config_init();
      bte_main_boot_entry(btc_init_callback);
  }
  
@@@ -59,7 -70,8 +62,9 @@@
  static void btc_deinit_bluetooth(void)
  {
      bte_main_shutdown();
 +    btc_config_clean_up();
+     osi_alarm_deinit();
+     osi_alarm_delete_mux();
      future_ready(*btc_main_get_future_p(BTC_MAIN_DEINIT_FUTURE), FUTURE_SUCCESS);
  }