Skip to content

Commit 28f9315

Browse files
cvinayakkartben
authored andcommitted
Revert "Bluetooth: Controller: Fix ext conn create when using single timer"
This reverts commit a7fff74. The next commit will re-add back the fix to primary advertising channel plus auxiliary advertising channel too. This will help keep the fix together regarding use of single timer for software tIFS switching implementation. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent e4b6751 commit 28f9315

File tree

3 files changed

+0
-15
lines changed

3 files changed

+0
-15
lines changed

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -641,15 +641,6 @@ uint32_t radio_is_done(void)
641641
}
642642
#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
643643

644-
uint32_t radio_is_tx_done(void)
645-
{
646-
if (IS_ENABLED(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)) {
647-
return radio_is_done();
648-
} else {
649-
return 1U;
650-
}
651-
}
652-
653644
uint32_t radio_has_disabled(void)
654645
{
655646
return (NRF_RADIO->EVENTS_DISABLED != 0);

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ void radio_status_reset(void);
8686
uint32_t radio_is_ready(void);
8787
uint32_t radio_is_address(void);
8888
uint32_t radio_is_done(void);
89-
uint32_t radio_is_tx_done(void);
9089
uint32_t radio_has_disabled(void);
9190
uint32_t radio_is_idle(void);
9291

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -581,11 +581,6 @@ static void isr_tx_rx(void *param)
581581
node_rx_prof = lll_prof_reserve();
582582
}
583583

584-
/* Call to ensure packet/event timer accumulates the elapsed time
585-
* under single timer use.
586-
*/
587-
(void)radio_is_tx_done();
588-
589584
/* Clear radio tx status and events */
590585
lll_isr_tx_status_reset();
591586

0 commit comments

Comments
 (0)