Commit 23d321d6 authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Benjamin Cabé
Browse files

Bluetooth: Controller: Fix end time capture be on radio event end 

Fix end time capture be on radio event end irrespective of
direction finding support. Let the timer clear use radio
end or radio phy end, for no direction finding or direction
finding support, respectively.

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent f67a94f4

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

+1 −1
Changes for subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ void radio_switch_complete_and_phy_end_b2b_tx(uint8_t phy_curr, uint8_t flags_cu 
					      uint8_t phy_next, uint8_t flags_next)

{

#if defined(CONFIG_BT_CTLR_TIFS_HW)

	NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk |

	NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | NRF_RADIO_SHORTS_TRX_END_DISABLE_Msk |

			    RADIO_SHORTS_DISABLED_TXEN_Msk;

#else /* !CONFIG_BT_CTLR_TIFS_HW */

	NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | NRF_RADIO_SHORTS_TRX_END_DISABLE_Msk;

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

+2 −1
Changes for subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ static inline void hal_radio_disable_on_hcto_ppi_config(void) 
 */

static inline void hal_radio_end_time_capture_ppi_config(void)

{

	nrf_radio_publish_set(NRF_RADIO, HAL_NRF_RADIO_EVENT_END, HAL_RADIO_END_TIME_CAPTURE_PPI);

	nrf_radio_publish_set(NRF_RADIO, HAL_NRF_RADIO_EVENT_END,

			      HAL_RADIO_END_TIME_CAPTURE_PPI);

	nrf_timer_subscribe_set(EVENT_TIMER, HAL_EVENT_TIMER_TRX_END_TASK,

				HAL_RADIO_END_TIME_CAPTURE_PPI);

}

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

+1 −1
Changes for subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static inline void hal_radio_end_time_capture_ppi_config(void) 
	nrf_ppi_channel_endpoint_setup(

		NRF_PPI,

		HAL_RADIO_END_TIME_CAPTURE_PPI,

		(uint32_t)&(NRF_RADIO->HAL_RADIO_TRX_EVENTS_END),

		(uint32_t)&(NRF_RADIO->HAL_RADIO_EVENTS_END),

		(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[HAL_EVENT_TIMER_TRX_END_CC_OFFSET]));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE