From 60f87e8ed9b8a2772dca91021eb91f4da235d348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Ku=C5=BAnia?= Date: Mon, 21 Oct 2024 10:42:48 +0200 Subject: [PATCH] fixup! modules: hal_nordic: rework resource reservations --- modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h | 4 ++-- .../hal_nordic/nrfx/nrfx_config_reserved_resources.h.jinja2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h index 00c448c66c1..a7f1632eaca 100644 --- a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h +++ b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h @@ -847,8 +847,8 @@ BUILD_ASSERT((NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV & (NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | NRFX_PPI_CHANNELS_USED_BY_802154_DRV | \ NRFX_PPI_CHANNELS_USED_BY_MPSL) -#define NRFX_DPPI_CHANNELS_USED 0 -#define NRFX_DPPI_GROUPS_USED 0 +#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED +#define NRFX_DPPI_GROUPS_USED NRFX_DPPI0_GROUPS_USED /** @brief Bitmask that defines PPI groups that are reserved for use outside * of the nrfx library. diff --git a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h.jinja2 b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h.jinja2 index 88d3059ccfb..6a6d77d61c9 100644 --- a/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h.jinja2 +++ b/modules/hal_nordic/nrfx/nrfx_config_reserved_resources.h.jinja2 @@ -191,8 +191,8 @@ BUILD_ASSERT((NRFX_PPIB_{{ppib[0]}}_{{ppib[1]}}_CHANNELS_USED_BY_802154_DRV & NRFX_PPI_CHANNELS_USED_BY_802154_DRV | \ NRFX_PPI_CHANNELS_USED_BY_MPSL) -#define NRFX_DPPI_CHANNELS_USED 0 -#define NRFX_DPPI_GROUPS_USED 0 +#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED +#define NRFX_DPPI_GROUPS_USED NRFX_DPPI0_GROUPS_USED /** @brief Bitmask that defines PPI groups that are reserved for use outside * of the nrfx library.