Skip to content

Commit dbf9d99

Browse files
ananglcarlescufi
authored andcommitted
bluetooth/controller: Update paths in inclusions of nrfx HAL files
After nrfx glue code was decoupled from nrfx sources, it is no longer feasible to use those inclusions in the <nrfx/hal/nrf_*.h> form (there is no point in adding the main directory of the hal_nordic module as an include path solely for this reason). Remove then the nrfx/ part. Signed-off-by: Andrzej Głąbek <[email protected]>
1 parent 251648a commit dbf9d99

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <sys/dlist.h>
99

10-
#include <nrfx/hal/nrf_rtc.h>
10+
#include <hal/nrf_rtc.h>
1111

1212
#include "hal/cntr.h"
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <sys/dlist.h>
1111

12-
#include <nrfx/hal/nrf_ecb.h>
12+
#include <hal/nrf_ecb.h>
1313

1414
#include "util/mem.h"
1515
#include "hal/ecb.h"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#include <sys/dlist.h>
99
#include <toolchain.h>
1010

11-
#include <nrfx/hal/nrf_radio.h>
12-
#include <nrfx/hal/nrf_rtc.h>
13-
#include <nrfx/hal/nrf_timer.h>
14-
#include <nrfx/hal/nrf_ccm.h>
15-
#include <nrfx/hal/nrf_aar.h>
11+
#include <hal/nrf_radio.h>
12+
#include <hal/nrf_rtc.h>
13+
#include <hal/nrf_timer.h>
14+
#include <hal/nrf_ccm.h>
15+
#include <hal/nrf_aar.h>
1616

1717
#include "util/mem.h"
1818
#include "hal/ccm.h"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
99

10-
#include <nrfx/hal/nrf_ppi.h>
10+
#include <hal/nrf_ppi.h>
1111

1212
static inline void hal_radio_nrf_ppi_channels_enable(uint32_t mask)
1313
{
@@ -605,7 +605,7 @@ static inline void hal_radio_sw_switch_ppi_group_setup(void)
605605

606606
#elif defined(CONFIG_SOC_NRF5340_CPUNET)
607607

608-
#include <nrfx/hal/nrf_dppi.h>
608+
#include <hal/nrf_dppi.h>
609609

610610
static inline void hal_radio_nrf_ppi_channels_enable(uint32_t mask)
611611
{

0 commit comments

Comments
 (0)