Bluetooth: Controller: Fix use of pre-programmed PPI

Fix to not use pre-programmed PPI when NRF_TIMER0 is not
used as the radio event timer.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#if defined(CONFIG_BT_CTLR_TIFS_HW) || !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+#if (EVENT_TIMER_ID == 0)
 
 /* PPI channel 20 is pre-programmed with the following fixed settings:
  *   EEP: TIMER0->EVENTS_COMPARE[0]
@@ -35,15 +35,15 @@
  */
 #define HAL_RADIO_END_TIME_CAPTURE_PPI 27
 
-#else /* CONFIG_BT_CTLR_TIFS_HW || !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#else /* EVENT_TIMER_ID != 0 */
 
 #define HAL_RADIO_ENABLE_TX_ON_TICK_PPI 2
 #define HAL_RADIO_ENABLE_RX_ON_TICK_PPI 2
 #define HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI 3
 #define HAL_RADIO_DISABLE_ON_HCTO_PPI 4
 #define HAL_RADIO_END_TIME_CAPTURE_PPI 5
 
-#endif /* CONFIG_BT_CTLR_TIFS_HW || !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#endif /* EVENT_TIMER_ID != 0 */
 
 /* Start event timer on RTC tick wire the RTC0 EVENTS_COMPARE[2] event to
  * EVENT_TIMER  TASKS_START task.
@@ -89,7 +89,7 @@
 #if !defined(CONFIG_BT_CTLR_TIFS_HW)
 /* PPI setup used for SW-based auto-switching during TIFS. */
 
-#if !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
+#if (EVENT_TIMER_ID == 0)
 
 /* Clear SW-switch timer on packet end:
  * wire the RADIO EVENTS_END event to SW_SWITCH_TIMER TASKS_CLEAR task.
@@ -98,7 +98,7 @@
  */
 #define HAL_SW_SWITCH_TIMER_CLEAR_PPI 8
 
-#else /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#else /* EVENT_TIMER_ID != 0  */
 
 /* Clear event timer (sw-switch timer) on Radio end:
  * wire the RADIO EVENTS_END event to the
@@ -109,7 +109,7 @@
  */
 #define HAL_SW_SWITCH_TIMER_CLEAR_PPI HAL_RADIO_END_TIME_CAPTURE_PPI
 
-#endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
+#endif /* EVENT_TIMER_ID != 0  */
 
 /* Wire a SW SWITCH TIMER EVENTS_COMPARE[<cc_offset>] event
  * to a PPI GROUP TASK DISABLE task (PPI group with index <index>).

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

@@ -7,8 +7,24 @@
 /* Use the timer instance ID, not NRF_TIMERx directly, so that it can be checked
  * in radio_nrf5_ppi.h by the preprocessor.
  */
-#if !defined(CONFIG_BT_CTLR_TIFS_HW)
+#if defined(CONFIG_BT_CTLR_TIFS_HW)
+#define EVENT_TIMER_ID 0
+#define EVENT_TIMER    _CONCAT(NRF_TIMER, EVENT_TIMER_ID)
 
+/* Wrapper for EVENTS_END event generated by Radio peripheral at the very end of the transmission
+ * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
+ * received or transmitted.
+ */
+#define NRF_RADIO_TXRX_END_EVENT EVENTS_END
+/* Wrapper for RADIO_SHORTS mask connecting EVENTS_END to EVENTS_DISABLE.
+ * This is a default shortcut used to automatically disable Radio after end of PDU.
+ */
+#define NRF_RADIO_SHORTS_PDU_END_DISABLE RADIO_SHORTS_END_DISABLE_Msk
+
+#define HAL_EVENT_TIMER_SAMPLE_CC_OFFSET 3
+#define HAL_EVENT_TIMER_SAMPLE_TASK NRF_TIMER_TASK_CAPTURE3
+
+#else /* !CONFIG_BT_CTLR_TIFS_HW */
 #if defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
 #define EVENT_TIMER_ID 4
 #define EVENT_TIMER    _CONCAT(NRF_TIMER, EVENT_TIMER_ID)
@@ -110,21 +126,4 @@
 #define HAL_EVENT_TIMER_SAMPLE_CC_OFFSET 3
 #define HAL_EVENT_TIMER_SAMPLE_TASK NRF_TIMER_TASK_CAPTURE3
 #endif /* !CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER */
-
-#else /* !CONFIG_BT_CTLR_TIFS_HW */
-#define EVENT_TIMER_ID 0
-#define EVENT_TIMER    _CONCAT(NRF_TIMER, EVENT_TIMER_ID)
-
-/* Wrapper for EVENTS_END event generated by Radio peripheral at the very end of the transmission
- * or reception of a PDU on air. In case of regular PDU it is generated when last bit of CRC is
- * received or transmitted.
- */
-#define NRF_RADIO_TXRX_END_EVENT EVENTS_END
-/* Wrapper for RADIO_SHORTS mask connecting EVENTS_END to EVENTS_DISABLE.
- * This is a default shortcut used to automatically disable Radio after end of PDU.
- */
-#define NRF_RADIO_SHORTS_PDU_END_DISABLE RADIO_SHORTS_END_DISABLE_Msk
-
-#define HAL_EVENT_TIMER_SAMPLE_CC_OFFSET 3
-#define HAL_EVENT_TIMER_SAMPLE_TASK NRF_TIMER_TASK_CAPTURE3
 #endif /* !CONFIG_BT_CTLR_TIFS_HW */