patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

Bluetooth: controller: Fix scan done generation

Browse source 
Fix scan done to be generated when the window is closed
both under abort and graceful window close.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-09-02 14:23:16 +05:30 committed by Carles Cufí
parent 1bc2861dee
commit 896c20188a
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
View file

@ -54,6 +54,7 @@ static void isr_tx(void *param);
static void isr_done(void *param);
static void isr_window(void *param);
static void isr_abort(void *param);
static void isr_done_cleanup(void *param);
static void isr_cleanup(void *param);
static inline bool isr_rx_scan_check(struct lll_scan *lll, uint8_t irkmatch_ok,
@ -365,7 +366,7 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t lazy,
void *param)
{
radio_isr_set(isr_cleanup, param);
radio_isr_set(isr_done_cleanup, param);
radio_disable();
}
@ -552,13 +553,6 @@ static void isr_done(void *param)
* master event.
*/
radio_tmr_end_capture();
struct event_done_extra *extra;
extra = ull_event_done_extra_get();
LL_ASSERT(extra);
extra->type = EVENT_DONE_EXTRA_TYPE_SCAN;
}
static void isr_window(void *param)
@ -614,15 +608,29 @@ static void isr_abort(void *param)
isr_cleanup(param);
}
static void isr_done_cleanup(void *param)
{
if (lll_is_done(param)) {
return;
}
#if defined(CONFIG_BT_CTLR_ADV_EXT)
struct event_done_extra *extra;
extra = ull_event_done_extra_get();
LL_ASSERT(extra);
extra->type = EVENT_DONE_EXTRA_TYPE_SCAN;
#endif /* CONFIG_BT_CTLR_ADV_EXT */
isr_cleanup(param);
}
static void isr_cleanup(void *param)
{
struct node_rx_hdr *node_rx;
struct lll_scan *lll;
if (lll_is_done(param)) {
return;
}
radio_filter_disable();
lll = param;
@ -807,7 +815,7 @@ static inline int isr_rx_pdu(struct lll_scan *lll, uint8_t devmatch_ok,
lll_prof_cputime_capture();
}
radio_isr_set(isr_cleanup, lll);
radio_isr_set(isr_done_cleanup, lll);
#if defined(CONFIG_BT_CTLR_GPIO_PA_PIN)
if (IS_ENABLED(CONFIG_BT_CTLR_PROFILE_ISR)) {