Commit f36ddf04 authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Fabio Baltieri
Browse files

Bluetooth: Controller: Fix BT_CTLR_TIFS_HW conditional compile 



Fix CONFIG_BT_CTLR_TIFS_HW conditional compile by replacing
DPPI_PRESENT with CONFIG_BT_CTLR_TIFS_HW.

HAL_SW_SWITCH_TIMER_CLEAR_PPI can be same as
HAL_RADIO_END_TIME_CAPTURE_PPI, and this is ok as same
bit will be used to disable PPI/DPPI.

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

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

+6 −6
Original line number Diff line number Diff line
@@ -1114,9 +1114,9 @@ void radio_tmr_status_reset(void) 
			BIT(HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI) |

			BIT(HAL_RADIO_DISABLE_ON_HCTO_PPI) |

			BIT(HAL_RADIO_END_TIME_CAPTURE_PPI) |

#if defined(DPPI_PRESENT)

#if !defined(CONFIG_BT_CTLR_TIFS_HW)

			BIT(HAL_SW_SWITCH_TIMER_CLEAR_PPI) |

#endif /* DPPI_PRESENT */

#endif /* !CONFIG_BT_CTLR_TIFS_HW */

#if defined(CONFIG_BT_CTLR_PHY_CODED)

#if defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED)

			BIT(HAL_TRIGGER_RATEOVERRIDE_PPI) |
@@ -1152,9 +1152,9 @@ void radio_tmr_tx_status_reset(void) 
			BIT(HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI) |

			BIT(HAL_RADIO_DISABLE_ON_HCTO_PPI) |

			BIT(HAL_RADIO_END_TIME_CAPTURE_PPI) |

#if defined(DPPI_PRESENT)

#if !defined(CONFIG_BT_CTLR_TIFS_HW)

			BIT(HAL_SW_SWITCH_TIMER_CLEAR_PPI) |

#endif /* DPPI_PRESENT */

#endif /* !CONFIG_BT_CTLR_TIFS_HW */

#if defined(CONFIG_BT_CTLR_PHY_CODED)

#if defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED)

			BIT(HAL_TRIGGER_RATEOVERRIDE_PPI) |
@@ -1190,9 +1190,9 @@ void radio_tmr_rx_status_reset(void) 
			BIT(HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI) |

			BIT(HAL_RADIO_DISABLE_ON_HCTO_PPI) |

			BIT(HAL_RADIO_END_TIME_CAPTURE_PPI) |

#if defined(DPPI_PRESENT)

#if !defined(CONFIG_BT_CTLR_TIFS_HW)

			BIT(HAL_SW_SWITCH_TIMER_CLEAR_PPI) |

#endif /* DPPI_PRESENT */

#endif /* !CONFIG_BT_CTLR_TIFS_HW */

#if defined(CONFIG_BT_CTLR_PHY_CODED)

#if defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED)

			BIT(HAL_TRIGGER_RATEOVERRIDE_PPI) |

CRA Git | Maintained and supported by SUSTech CRA and CCSE