Skip to content

Commit e358d0a

Browse files
committed
Revert "[nrf noup] modules: hal_nordic: add DPPI channel allocation for NRFE"
This reverts commit 1265858. Signed-off-by: Rafał Kuźnia <[email protected]>
1 parent 9342080 commit e358d0a

File tree

2 files changed

+2
-33
lines changed

2 files changed

+2
-33
lines changed

modules/hal_nordic/nrfx/nrfe_config.h

Lines changed: 0 additions & 20 deletions
This file was deleted.

modules/hal_nordic/nrfx/nrfx_glue.h

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -317,14 +317,12 @@ void nrfx_busy_wait(uint32_t usec_to_wait);
317317
/** @brief Bitmask that defines DPPI channels that are reserved for use outside of the nrfx library. */
318318
#define NRFX_DPPI_CHANNELS_USED (NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | \
319319
NRFX_PPI_CHANNELS_USED_BY_802154_DRV | \
320-
NRFX_PPI_CHANNELS_USED_BY_MPSL | \
321-
NRFX_PPI_CHANNELS_USED_BY_NRFE)
320+
NRFX_PPI_CHANNELS_USED_BY_MPSL)
322321

323322
/** @brief Bitmask that defines DPPI groups that are reserved for use outside of the nrfx library. */
324323
#define NRFX_DPPI_GROUPS_USED (NRFX_PPI_GROUPS_USED_BY_BT_CTLR | \
325324
NRFX_PPI_GROUPS_USED_BY_802154_DRV | \
326-
NRFX_PPI_GROUPS_USED_BY_MPSL | \
327-
NRFX_PPI_GROUPS_USED_BY_NRFE)
325+
NRFX_PPI_GROUPS_USED_BY_MPSL)
328326

329327
/** @brief Bitmask that defines PPI channels that are reserved for use outside of the nrfx library. */
330328
#define NRFX_PPI_CHANNELS_USED (NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | \
@@ -397,15 +395,6 @@ void nrfx_busy_wait(uint32_t usec_to_wait);
397395
#define NRFX_PPI_GROUPS_USED_BY_MPSL 0
398396
#endif
399397

400-
#if defined(CONFIG_NRFE)
401-
#include <nrfe_config.h>
402-
#define NRFX_PPI_CHANNELS_USED_BY_NRFE NRFE_RESERVED_PPI_CHANNELS
403-
#define NRFX_PPI_GROUPS_USED_BY_NRFE 0
404-
#else
405-
#define NRFX_PPI_CHANNELS_USED_BY_NRFE 0
406-
#define NRFX_PPI_GROUPS_USED_BY_NRFE 0
407-
#endif
408-
409398
#if defined(NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL)
410399
BUILD_ASSERT(
411400
(NRFX_PPI_CHANNELS_USED_BY_802154_DRV & NRFX_PPI_CHANNELS_USED_BY_MPSL) == 0,

0 commit comments

Comments
 (0)