From b7a5fef87149c55f861d7fd08edebd8d0c900bee Mon Sep 17 00:00:00 2001 From: zhiweijian Date: Thu, 10 May 2018 11:39:34 +0800 Subject: [PATCH] Component/bt: fix crash without SMP when deinit bluedroid - fix crash without SMP when bluedroid deinit - modify default menuconfig in blufi demo --- components/bt/bluedroid/btc/core/btc_main.c | 2 ++ examples/bluetooth/blufi/sdkconfig.defaults | 22 +++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/components/bt/bluedroid/btc/core/btc_main.c b/components/bt/bluedroid/btc/core/btc_main.c index b6c9606be6..df3bfc4001 100644 --- a/components/bt/bluedroid/btc/core/btc_main.c +++ b/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); } diff --git a/examples/bluetooth/blufi/sdkconfig.defaults b/examples/bluetooth/blufi/sdkconfig.defaults index dcf4ad2c2d..a0d1d3652f 100644 --- a/examples/bluetooth/blufi/sdkconfig.defaults +++ b/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