From e642aa35135e43e1e7cab724bc3008a2a794bfbf Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Fri, 14 Jun 2024 16:30:12 +0200 Subject: [PATCH] Bluetooth: Controller: nRF54Lx: Use nrfx interface for bsim use (4/4) Use nrfx interface for register access with sideeffects to facilitate bsim use. Remove CMSIS interface use, was replaced with nrf_grtc, nrf_dppic and nrf_ppib interface in previous commit. 4 part commits: 1. Add nrf_grtc interface. 2. Remove CMSIS interface use. 3. Add nrf_grtc interface, once missing bsim port available. 4. Remove CMSIS interface use, replaced by bsim port. Signed-off-by: Vinayak Kariappa Chettimada --- .../ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h index e4ceae36bca..770cb70d8cc 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h +++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h @@ -102,30 +102,18 @@ static inline void hal_event_timer_start_ppi_config(void) { #if defined(CONFIG_BT_CTLR_NRF_GRTC) /* Publish GRTC compare */ - NRF_GRTC->PUBLISH_COMPARE[HAL_CNTR_GRTC_CC_IDX_RADIO] = - ((HAL_EVENT_TIMER_START_PPI << - GRTC_PUBLISH_COMPARE_CHIDX_Pos) & - GRTC_PUBLISH_COMPARE_CHIDX_Msk) | - ((GRTC_PUBLISH_COMPARE_EN_Enabled << - GRTC_PUBLISH_COMPARE_EN_Pos) & - GRTC_PUBLISH_COMPARE_EN_Msk); nrf_grtc_publish_set(NRF_GRTC, HAL_CNTR_GRTC_EVENT_COMPARE_RADIO, HAL_EVENT_TIMER_START_PPI); /* Enable same DPPI in Global domain */ - NRF_DPPIC20->CHENSET = BIT(HAL_EVENT_TIMER_START_PPI); nrf_dppi_channels_enable(NRF_DPPIC20, BIT(HAL_EVENT_TIMER_START_PPI)); /* Setup PPIB send subscribe */ - NRF_PPIB21->SUBSCRIBE_SEND[HAL_EVENT_TIMER_START_PPI] = - BIT(HAL_EVENT_TIMER_START_PPI) | PPIB_SUBSCRIBE_SEND_EN_Msk; nrf_ppib_subscribe_set(NRF_PPIB21, HAL_PPIB_SEND_EVENT_TIMER_START_PPI, HAL_EVENT_TIMER_START_PPI); /* Setup PPIB receive publish */ - NRF_PPIB11->PUBLISH_RECEIVE[HAL_EVENT_TIMER_START_PPI] = - BIT(HAL_EVENT_TIMER_START_PPI) | PPIB_PUBLISH_RECEIVE_EN_Msk; nrf_ppib_publish_set(NRF_PPIB11, HAL_PPIB_RECEIVE_EVENT_TIMER_START_PPI, HAL_EVENT_TIMER_START_PPI);