From 7573ac521d837213e1507d2bb7af7ae70141c0a8 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Mon, 20 Jan 2025 21:15:19 +0100 Subject: [PATCH] Bluetooth: Controller: Fix regression in Code PHY S2 Rx to any PHY Tx Fix regression in Coded PHY S2 reception to any other PHY Tx in the s/w switch implementation. Regression in commit 55b7dba8ec93 ("Bluetooth: Controller: Refactor sw_switch hal interface use"). Signed-off-by: Vinayak Kariappa Chettimada --- .../controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h | 2 +- .../controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h | 3 ++- 2 files changed, 3 insertions(+), 2 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 1f5c2205f3c..06aea328eaf 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 @@ -559,7 +559,7 @@ static inline void hal_radio_sw_switch_coded_tx_config_set(uint8_t ppi_en, HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_REGISTER_EVT = HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_EVT; nrf_timer_subscribe_set(SW_SWITCH_TIMER, - nrf_timer_capture_task_get(cc_s2), + nrf_timer_capture_task_get(SW_SWITCH_TIMER_EVTS_COMP(group_index)), HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI); nrf_dppi_channels_enable(NRF_DPPIC, diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h index 5d18d76ff61..05445e1fb48 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h +++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi.h @@ -517,7 +517,8 @@ static inline void hal_radio_sw_switch_coded_tx_config_set(uint8_t ppi_en, nrf_ppi_event_endpoint_setup(NRF_PPI, HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI, HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_EVT); nrf_ppi_task_endpoint_setup(NRF_PPI, HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI, - HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_TASK(cc_s2)); + HAL_SW_SWITCH_TIMER_S8_DISABLE_PPI_TASK( + SW_SWITCH_TIMER_EVTS_COMP(group_index))); nrf_ppi_channels_enable( NRF_PPI,