Просмотр исходного кода

Merge branch 'bugfix/btdm_fix_crash_without_smp_when_deinit_bluedroid' into 'master'

Component/bt: fix crash without SMP when deinit bluedroid

See merge request idf/esp-idf!2375
Jiang Jiang Jian 7 лет назад
Родитель
Сommit
6adaeb0048

+ 2 - 0
components/bt/bluedroid/btc/core/btc_main.c

@@ -44,7 +44,9 @@ static void btc_enable_bluetooth(void)
 
 static void btc_disable_bluetooth(void)
 {
+#if (SMP_INCLUDED)
     btc_config_shut_down();
+#endif
     if (BTA_DisableBluetooth() != BTA_SUCCESS) {
         future_ready(*btc_main_get_future_p(BTC_MAIN_DISABLE_FUTURE), FUTURE_FAIL);
     }

+ 22 - 0
examples/bluetooth/blufi/sdkconfig.defaults

@@ -5,3 +5,25 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_0=y
+CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=
+CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
+CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y
+CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4=
+CONFIG_BLUEDROID_ENABLED=y
+CONFIG_BLUEDROID_PINNED_TO_CORE_0=y
+CONFIG_BLUEDROID_PINNED_TO_CORE_1=
+CONFIG_BLUEDROID_PINNED_TO_CORE=0
+CONFIG_BTC_TASK_STACK_SIZE=3072
+CONFIG_BLUEDROID_MEM_DEBUG=
+CONFIG_CLASSIC_BT_ENABLED=
+CONFIG_GATTS_ENABLE=y
+CONFIG_GATTC_ENABLE=
+CONFIG_BLE_SMP_ENABLE=
+CONFIG_BLE_ENABLE_SRVCHG_REG=y
+CONFIG_BT_STACK_NO_LOG=
+CONFIG_BT_ACL_CONNECTIONS=4
+CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=
+CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=
+CONFIG_SMP_ENABLE=
+CONFIG_BT_RESERVE_DRAM=0x10000