Skip to content

Commit 7e51788

Browse files
cvinayakkartben
authored andcommitted
Bluetooth: Controller: Add radio_sim_nrf54l.h file
Add radio_sim_nrf54l.h file, which for now a copy of the SoC radio_nrf54lx.h file. This is added for having separate simulation model dependent timing values and specific implementation details. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent dd95c22 commit 7e51788

File tree

4 files changed

+824
-18
lines changed

4 files changed

+824
-18
lines changed

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020
#define HAL_RADIO_NS2US_ROUND(ns) ((ns + 500)/1000)
2121

2222
/* SoC specific defines */
23-
#if defined(CONFIG_BOARD_NRF52_BSIM)
24-
#include "radio_sim_nrf52.h"
25-
#elif defined(CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUNET)
26-
#include "radio_sim_nrf5340.h"
27-
#elif defined(CONFIG_SOC_SERIES_NRF51X)
23+
#if defined(CONFIG_SOC_SERIES_NRF51X)
2824
#include "radio_nrf51.h"
2925
#elif defined(CONFIG_SOC_NRF52805)
3026
#include "radio_nrf52805.h"
@@ -43,9 +39,16 @@
4339
#elif defined(CONFIG_SOC_NRF5340_CPUNET)
4440
#include <hal/nrf_vreqctrl.h>
4541
#include "radio_nrf5340.h"
46-
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
42+
#elif defined(CONFIG_SOC_SERIES_NRF54LX)
4743
#include "radio_nrf54lx.h"
48-
#else /* !CONFIG_SOC_COMPATIBLE_NRF54LX */
44+
#elif defined(CONFIG_BOARD_NRF52_BSIM)
45+
#include "radio_sim_nrf52.h"
46+
#elif defined(CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUNET)
47+
#include <hal/nrf_vreqctrl.h>
48+
#include "radio_sim_nrf5340.h"
49+
#elif defined(CONFIG_BOARD_NRF54L15BSIM_NRF54L15_CPUAPP)
50+
#include "radio_sim_nrf54l.h"
51+
#else
4952
#error "Unsupported SoC."
5053
#endif
5154

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
* SPDX-License-Identifier: Apache-2.0
77
*/
88

9-
/*
10-
* This header needs lots of types and macros, instead of relaying on
11-
* good inclusion order let's pull them through soc.h
12-
*/
13-
#include <soc.h>
14-
159
/* Use the NRF_RTC instance for coarse radio event scheduling */
1610
#define NRF_RTC NRF_RTC0
1711

@@ -156,10 +150,9 @@
156150
*/
157151
#define HAL_RADIO_NRF52833_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_NS 129000
158152
#define HAL_RADIO_NRF52833_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_US \
159-
HAL_RADIO_NS2US_CEIL(\
153+
HAL_RADIO_NS2US_CEIL( \
160154
HAL_RADIO_NRF52833_RXEN_RXIDLE_RX_2M_DEFAULT_NO_HW_TIFS_NS)
161155

162-
163156
/* RXEN->RXIDLE + RXIDLE->RX (with fast Radio ramp-up mode)
164157
* in microseconds for LE Coded PHY [S2].
165158
*/

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
* SPDX-License-Identifier: Apache-2.0
66
*/
77

8-
#include <soc.h>
9-
#include <hal/nrf_vreqctrl.h>
10-
118
/* Use the NRF_RTC instance for coarse radio event scheduling */
129
#define NRF_RTC NRF_RTC0
1310

0 commit comments

Comments
 (0)