Bluetooth: Controller: Minor conditional compile refactor

cvinayak · carlescufi · commit 30b4c29aaf5d · 2021-08-16T12:46:43.000+02:00
Minor conditional compile refactor.

Signed-off-by: Vinayak Kariappa Chettimada &lt;vich@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
@@ -519,15 +519,15 @@ static int is_abort_cb(void *next, void *curr, lll_prepare_cb_t *resume_cb)
 		}
 	}
 
+	if (0) {
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
-	if (unlikely(lll->duration_reload && !lll->duration_expire)) {
+	} else if (unlikely(lll->duration_reload && !lll->duration_expire)) {
 		radio_isr_set(isr_done_cleanup, lll);
 	} else if (lll->is_aux_sched) {
 		/* as a continuous scanner, let us not abort aux PDU scan */
 		return 0;
-	} else
 #endif /* CONFIG_BT_CTLR_ADV_EXT */
-	{
+	} else {
 		radio_isr_set(isr_window, lll);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -519,15 +519,15 @@ static int is_abort_cb(void next, void curr, lll_prepare_cb_t *resume_cb)`
`519`	`519`	`}`
`520`	`520`	`}`
`521`	`521`
	`522`	`+ if (0) {`
`522`	`523`	`#if defined(CONFIG_BT_CTLR_ADV_EXT)`
`523`		`- if (unlikely(lll->duration_reload && !lll->duration_expire)) {`
	`524`	`+ } else if (unlikely(lll->duration_reload && !lll->duration_expire)) {`
`524`	`525`	`radio_isr_set(isr_done_cleanup, lll);`
`525`	`526`	`} else if (lll->is_aux_sched) {`
`526`	`527`	`/* as a continuous scanner, let us not abort aux PDU scan */`
`527`	`528`	`return 0;`
`528`		`- } else`
`529`	`529`	`#endif /* CONFIG_BT_CTLR_ADV_EXT */`
`530`		`- {`
	`530`	`+ } else {`
`531`	`531`	`radio_isr_set(isr_window, lll);`
`532`	`532`	`}`
`533`	`533`