Merge branch 'bugfix/btdm_hci_timeout_v4.1' into 'release/v4.1'
Bugfix/btdm hci timeout v4.1 See merge request espressif/esp-idf!7339
This commit is contained in:
commit
3733c9f8e5
3 changed files with 6 additions and 6 deletions
|
@ -40,14 +40,14 @@
|
||||||
/**********************************************************
|
/**********************************************************
|
||||||
* Thread/Task reference
|
* Thread/Task reference
|
||||||
**********************************************************/
|
**********************************************************/
|
||||||
#ifdef CONFIG_BLUEDROID_PINNED_TO_CORE
|
#ifdef CONFIG_BT_BLUEDROID_PINNED_TO_CORE
|
||||||
#define UC_TASK_PINNED_TO_CORE (CONFIG_BLUEDROID_PINNED_TO_CORE < portNUM_PROCESSORS ? CONFIG_BLUEDROID_PINNED_TO_CORE : tskNO_AFFINITY)
|
#define UC_TASK_PINNED_TO_CORE (CONFIG_BT_BLUEDROID_PINNED_TO_CORE < portNUM_PROCESSORS ? CONFIG_BT_BLUEDROID_PINNED_TO_CORE : tskNO_AFFINITY)
|
||||||
#else
|
#else
|
||||||
#define UC_TASK_PINNED_TO_CORE (0)
|
#define UC_TASK_PINNED_TO_CORE (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_BTC_TASK_STACK_SIZE
|
#ifdef CONFIG_BT_BTC_TASK_STACK_SIZE
|
||||||
#define UC_BTC_TASK_STACK_SIZE CONFIG_BTC_TASK_STACK_SIZE
|
#define UC_BTC_TASK_STACK_SIZE CONFIG_BT_BTC_TASK_STACK_SIZE
|
||||||
#else
|
#else
|
||||||
#define UC_BTC_TASK_STACK_SIZE 4096
|
#define UC_BTC_TASK_STACK_SIZE 4096
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 0f1f79c62070d7fcb7582401b33d267551dd3ad8
|
Subproject commit c246009ffb8dd8d92ba8840171df1f723b116f55
|
|
@ -18,7 +18,7 @@
|
||||||
/* BLE Mesh Max Connection Count */
|
/* BLE Mesh Max Connection Count */
|
||||||
#ifdef CONFIG_BT_BLUEDROID_ENABLED
|
#ifdef CONFIG_BT_BLUEDROID_ENABLED
|
||||||
#define BLE_MESH_MAX_CONN \
|
#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
|
#define ADV_TASK_CORE TASK_PINNED_TO_CORE
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue