michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Fix scan set allocation

Browse source 
Fix scan set allocation using BT_CTLR_SCAN_SET instead of
an incorrect duplicate BT_CTLR_SCAN_MAX.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-05-04 17:32:48 +05:30 • committed by Carles Cufí
commit 516bae9536
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/bluetooth/controller/ll_sw/ull_scan.c
View file

@ -48,13 +48,7 @@ static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t laz
void *param); void *param);
static uint8_t disable(uint8_t handle); static uint8_t disable(uint8_t handle);
#if defined(CONFIG_BT_CTLR_ADV_EXT) static struct ll_scan_set ll_scan[BT_CTLR_SCAN_SET];
#define BT_CTLR_SCAN_MAX 2
#else /* !CONFIG_BT_CTLR_ADV_EXT */
#define BT_CTLR_SCAN_MAX 1
#endif /* !CONFIG_BT_CTLR_ADV_EXT */
static struct ll_scan_set ll_scan[BT_CTLR_SCAN_MAX];
uint8_t ll_scan_params_set(uint8_t type, uint16_t interval, uint16_t window, uint8_t ll_scan_params_set(uint8_t type, uint16_t interval, uint16_t window,
uint8_t own_addr_type, uint8_t filter_policy) uint8_t own_addr_type, uint8_t filter_policy)
@ -226,7 +220,7 @@ int ull_scan_reset(void)
uint8_t handle; uint8_t handle;
int err; int err;
for (handle = 0U; handle < BT_CTLR_SCAN_MAX; handle++) { for (handle = 0U; handle < BT_CTLR_SCAN_SET; handle++) {
(void)disable(handle); (void)disable(handle);
} }
@ -400,7 +394,7 @@ uint8_t ull_scan_disable(uint8_t handle, struct ll_scan_set *scan)
struct ll_scan_set *ull_scan_set_get(uint8_t handle) struct ll_scan_set *ull_scan_set_get(uint8_t handle)
{ {
if (handle >= BT_CTLR_SCAN_MAX) { if (handle >= BT_CTLR_SCAN_SET) {
return NULL; return NULL;
} }