From 0f3eb977cd9324a61011da2632414cd7b9d17762 Mon Sep 17 00:00:00 2001 From: yulong Date: Wed, 28 Nov 2018 20:00:40 +0800 Subject: [PATCH] component/bt: Added the ble full scan supported feature. 1. Add the full scan swith in the menuconfig; 2. Change the bt lib in order to support ble full scan --- components/bt/Kconfig | 9 ++++++++- components/bt/bt.c | 4 ++++ components/bt/lib | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/components/bt/Kconfig b/components/bt/Kconfig index 93b8fe298d..c8e63ad9e7 100644 --- a/components/bt/Kconfig +++ b/components/bt/Kconfig @@ -124,6 +124,7 @@ config BT_HCI_UART_BAUDRATE default 921600 help UART Baudrate for HCI. Please use standard baudrate. + endmenu menu "MODEM SLEEP Options" @@ -238,7 +239,13 @@ config MESH_DUPLICATE_SCAN_CACHE_SIZE Maximum number of adv packets which can be recorded in duplicate scan cache for BLE Mesh. When the maximum amount of device in the filter is reached, the cache will be refreshed. - +config BTDM_CONTROLLER_FULL_SCAN_SUPPORTED + bool "BLE full scan feature supported" + depends on BTDM_CONTROLLER_MODE_BLE_ONLY + default n + help + The full scan function is mainly used to provide BLE scan performance. + This is required for scenes with high scan performance requirements, such as BLE Mesh scenes. endmenu diff --git a/components/bt/bt.c b/components/bt/bt.c index 730c274d01..7d8cfed4a5 100644 --- a/components/bt/bt.c +++ b/components/bt/bt.c @@ -61,6 +61,7 @@ #define BTDM_CFG_CONTROLLER_RUN_APP_CPU (1<<2) #define BTDM_CFG_SCAN_DUPLICATE_OPTIONS (1<<3) #define BTDM_CFG_SEND_ADV_RESERVED_SIZE (1<<4) +#define BTDM_CFG_BLE_FULL_SCAN_SUPPORTED (1<<5) /* Sleep mode */ #define BTDM_MODEM_SLEEP_MODE_NONE (0) @@ -810,6 +811,9 @@ static uint32_t btdm_config_mask_load(void) #if CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE == 1 mask |= BTDM_CFG_CONTROLLER_RUN_APP_CPU; #endif +#if CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED + mask |= BTDM_CFG_BLE_FULL_SCAN_SUPPORTED; +#endif /* CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED */ mask |= BTDM_CFG_SCAN_DUPLICATE_OPTIONS; mask |= BTDM_CFG_SEND_ADV_RESERVED_SIZE; diff --git a/components/bt/lib b/components/bt/lib index 27ea8fa3f1..6d3daa99f5 160000 --- a/components/bt/lib +++ b/components/bt/lib @@ -1 +1 @@ -Subproject commit 27ea8fa3f11183c7e70d657b6fba6d699ed34968 +Subproject commit 6d3daa99f5ac3077183850557b02e822db714d17