michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Fix missing coded PHY scanning

Browse source 
Fix, use phy variable instead of type to determine if
scanning on Coded PHY is to be enabled.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-04-14 17:26:19 +05:30 • committed by Carles Cufí
commit eb102d7822
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,17 +124,17 @@ uint8_t ll_scan_enable(uint8_t enable)
return BT_HCI_ERR_CMD_DISALLOWED;
}
if (IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT)) {
scan_coded = ull_scan_is_disabled_get(SCAN_HANDLE_PHY_CODED);
if (!scan_coded) {
return BT_HCI_ERR_CMD_DISALLOWED;
}
own_addr_type = scan_coded->own_addr_type;
is_coded_phy = (scan_coded->lll.type >> 1) &
BT_HCI_LE_EXT_SCAN_PHY_CODED;
#if defined(CONFIG_BT_CTLR_ADV_EXT)
scan_coded = ull_scan_is_disabled_get(SCAN_HANDLE_PHY_CODED);
if (!scan_coded) {
return BT_HCI_ERR_CMD_DISALLOWED;
}
own_addr_type = scan_coded->own_addr_type;
is_coded_phy = (scan_coded->lll.phy &
BT_HCI_LE_EXT_SCAN_PHY_CODED);
#endif /* CONFIG_BT_CTLR_ADV_EXT */
if ((IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT) && is_coded_phy &&
(own_addr_type & 0x1)) ||
(scan->own_addr_type & 0x1)) {
@ -169,9 +169,10 @@ uint8_t ll_scan_enable(uint8_t enable)
}
#endif
if (!IS_ENABLED(CONFIG_BT_CTLR_ADV_EXT) ||
!is_coded_phy ||
((scan->lll.type >> 1) & BIT(0))) {
#if defined(CONFIG_BT_CTLR_ADV_EXT)
if (!is_coded_phy || (scan->lll.phy & BT_HCI_LE_EXT_SCAN_PHY_1M))
#endif /* CONFIG_BT_CTLR_ADV_EXT */
{
err = ull_scan_enable(scan);
if (err) {
return err;