michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix to use correct anchor for scanner

Browse source 
Fixed a defect wherein anchor for first scanner event was in
the past (when looking for a free timeslice to avoid
overlapping with master role events) when actually there
were no master roles active. This defect caused the scanner
role to assert, when started with other roles active (eg.
advertiser), when trying to catch-up to current tick.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2017-07-13 15:33:18 +02:00 • committed by Carles Cufi
commit 9dc7975b76
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -8595,10 +8595,19 @@ u32_t radio_scan_enable(u8_t type, u8_t init_addr_type, u8_t *init_addr,
}
#if defined(CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED)
else {
u32_t ticks_ref = 0;
sched_after_mstr_free_slot_get(RADIO_TICKER_USER_ID_APP,
(ticks_slot_offset +
_radio.scanner.hdr.ticks_slot),
&ticks_anchor, &us_offset);
&ticks_ref, &us_offset);
/* Use the ticks_ref as scanner's anchor if a free time space
* after any master role is available (indicated by a non-zero
* us_offset value).
*/
if (us_offset) {
ticks_anchor = ticks_ref;
}
}
#endif /* CONFIG_BLUETOOTH_CONTROLLER_SCHED_ADVANCED */