Skip to content

Commit 23d321d

Browse files
cvinayakkartben
authored andcommitted
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: Vinayak Kariappa Chettimada <[email protected]>
1 parent f67a94f commit 23d321d

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ void radio_switch_complete_and_phy_end_b2b_tx(uint8_t phy_curr, uint8_t flags_cu
399399
uint8_t phy_next, uint8_t flags_next)
400400
{
401401
#if defined(CONFIG_BT_CTLR_TIFS_HW)
402-
NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk |
402+
NRF_RADIO->SHORTS = RADIO_SHORTS_READY_START_Msk | NRF_RADIO_SHORTS_TRX_END_DISABLE_Msk |
403403
RADIO_SHORTS_DISABLED_TXEN_Msk;
404404
#else /* !CONFIG_BT_CTLR_TIFS_HW */
405405
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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ static inline void hal_radio_disable_on_hcto_ppi_config(void)
8989
*/
9090
static inline void hal_radio_end_time_capture_ppi_config(void)
9191
{
92-
nrf_radio_publish_set(NRF_RADIO, HAL_NRF_RADIO_EVENT_END, HAL_RADIO_END_TIME_CAPTURE_PPI);
92+
nrf_radio_publish_set(NRF_RADIO, HAL_NRF_RADIO_EVENT_END,
93+
HAL_RADIO_END_TIME_CAPTURE_PPI);
9394
nrf_timer_subscribe_set(EVENT_TIMER, HAL_EVENT_TIMER_TRX_END_TASK,
9495
HAL_RADIO_END_TIME_CAPTURE_PPI);
9596
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static inline void hal_radio_end_time_capture_ppi_config(void)
177177
nrf_ppi_channel_endpoint_setup(
178178
NRF_PPI,
179179
HAL_RADIO_END_TIME_CAPTURE_PPI,
180-
(uint32_t)&(NRF_RADIO->HAL_RADIO_TRX_EVENTS_END),
180+
(uint32_t)&(NRF_RADIO->HAL_RADIO_EVENTS_END),
181181
(uint32_t)&(EVENT_TIMER->TASKS_CAPTURE[HAL_EVENT_TIMER_TRX_END_CC_OFFSET]));
182182
}
183183

0 commit comments

Comments
 (0)