From f6523748fcc4c0be27eb2fbf705fd318e486ffd4 Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Tue, 14 Jan 2020 12:16:24 +0800 Subject: [PATCH 1/2] fix Kconfig use mistake cause some config not effect 1. Fix bluedroid task pinned_to_core un-effected 2. other minor sdkconfig bugs --- components/bt/common/include/bt_user_config.h | 8 ++++---- .../bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/bt/common/include/bt_user_config.h b/components/bt/common/include/bt_user_config.h index 52b855f31..d49630060 100644 --- a/components/bt/common/include/bt_user_config.h +++ b/components/bt/common/include/bt_user_config.h @@ -40,14 +40,14 @@ /********************************************************** * Thread/Task reference **********************************************************/ -#ifdef CONFIG_BLUEDROID_PINNED_TO_CORE -#define UC_TASK_PINNED_TO_CORE (CONFIG_BLUEDROID_PINNED_TO_CORE < portNUM_PROCESSORS ? CONFIG_BLUEDROID_PINNED_TO_CORE : tskNO_AFFINITY) +#ifdef CONFIG_BT_BLUEDROID_PINNED_TO_CORE +#define UC_TASK_PINNED_TO_CORE (CONFIG_BT_BLUEDROID_PINNED_TO_CORE < portNUM_PROCESSORS ? CONFIG_BT_BLUEDROID_PINNED_TO_CORE : tskNO_AFFINITY) #else #define UC_TASK_PINNED_TO_CORE (0) #endif -#ifdef CONFIG_BTC_TASK_STACK_SIZE -#define UC_BTC_TASK_STACK_SIZE CONFIG_BTC_TASK_STACK_SIZE +#ifdef CONFIG_BT_BTC_TASK_STACK_SIZE +#define UC_BTC_TASK_STACK_SIZE CONFIG_BT_BTC_TASK_STACK_SIZE #else #define UC_BTC_TASK_STACK_SIZE 4096 #endif diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h b/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h index 563d070fe..cf6af7554 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h +++ b/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h @@ -18,7 +18,7 @@ /* BLE Mesh Max Connection Count */ #ifdef CONFIG_BT_BLUEDROID_ENABLED #define BLE_MESH_MAX_CONN \ - MIN(CONFIG_BT_ACL_CONNECTIONS, CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN) + MIN(CONFIG_BT_ACL_CONNECTIONS, CONFIG_BTDM_CTRL_BLE_MAX_CONN) #define ADV_TASK_CORE TASK_PINNED_TO_CORE #endif From 3e4e538087640d725882a6a1d7af56a03e83ac80 Mon Sep 17 00:00:00 2001 From: Tian Hao Date: Wed, 15 Jan 2020 15:03:39 +0800 Subject: [PATCH 2/2] fix bug sleep may cause HCI timeout When Host run different cpu and sleep enable, it may cause hci timeout about 10s. --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 0f1f79c62..c246009ff 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 0f1f79c62070d7fcb7582401b33d267551dd3ad8 +Subproject commit c246009ffb8dd8d92ba8840171df1f723b116f55