Bluetooth: Controller: Fix regression due to use of TMR_START_DELAY_US

cvinayak · alayander · commit 21be6a23f41f · 2024-06-13T15:34:06.000-04:00
Fix regression due to use of HAL_RADIO_TMR_START_DELAY_US introduced in commit 11bae5c ("Bluetooth: Controller: Fix missing radio timer comp and range delay"). Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -904,7 +904,7 @@ void sw_switch(uint8_t dir_curr, uint8_t dir_next, uint8_t phy_curr, uint8_t fla
 	if (delay < SW_SWITCH_TIMER->CC[cc]) {
 		nrf_timer_cc_set(SW_SWITCH_TIMER,
 				 cc,
-				 (SW_SWITCH_TIMER->CC[cc] - delay - HAL_RADIO_TMR_START_DELAY_US));
+				 (SW_SWITCH_TIMER->CC[cc] - delay));
 	} else {
 		nrf_timer_cc_set(SW_SWITCH_TIMER, cc, 1);
 	}

Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,7 @@ void sw_switch(uint8_t dir_curr, uint8_t dir_next, uint8_t phy_curr, uint8_t fla`
`904`	`904`	`if (delay < SW_SWITCH_TIMER->CC[cc]) {`
`905`	`905`	`nrf_timer_cc_set(SW_SWITCH_TIMER,`
`906`	`906`	`cc,`
`907`		`- (SW_SWITCH_TIMER->CC[cc] - delay - HAL_RADIO_TMR_START_DELAY_US));`
	`907`	`+ (SW_SWITCH_TIMER->CC[cc] - delay));`
`908`	`908`	`} else {`
`909`	`909`	`nrf_timer_cc_set(SW_SWITCH_TIMER, cc, 1);`
`910`	`910`	`}`