Skip to content

Commit 87432d9

Browse files
eivindj-nordicnordic-krch
authored andcommitted
[nrf noup] modules: hal_nordic: nrfx: Add SoftDevice PPI resources
Use PPI resources information from SoftDevice when it is present. Co-authored-by: Krzysztof Chruściński <[email protected]> Signed-off-by: Eivind Jølsgard <[email protected]>
1 parent 8e073f8 commit 87432d9

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

modules/hal_nordic/nrfx/nrfx_config_reserved_resources_ncs.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ BUILD_ASSERT((NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV &
894894
*/
895895
#define NRFX_PPI_CHANNELS_USED \
896896
(NRFX_PPI_CHANNELS_USED_BY_BT_CTLR | NRFX_PPI_CHANNELS_USED_BY_802154_DRV | \
897-
NRFX_PPI_CHANNELS_USED_BY_MPSL)
897+
NRFX_PPI_CHANNELS_USED_BY_MPSL | NRFX_PPI_CHANNELS_USED_BY_SD)
898898

899899
#define NRFX_DPPI_CHANNELS_USED NRFX_DPPI0_CHANNELS_USED
900900
#define NRFX_DPPI_GROUPS_USED NRFX_DPPI0_GROUPS_USED
@@ -904,7 +904,7 @@ BUILD_ASSERT((NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV &
904904
*/
905905
#define NRFX_PPI_GROUPS_USED \
906906
(NRFX_PPI_GROUPS_USED_BY_BT_CTLR | NRFX_PPI_GROUPS_USED_BY_802154_DRV | \
907-
NRFX_PPI_GROUPS_USED_BY_MPSL)
907+
NRFX_PPI_GROUPS_USED_BY_MPSL | NRFX_PPI_GROUPS_USED_BY_SD)
908908

909909
#define NRFX_PPIB_INTERCONNECT_00_10_CHANNELS_USED \
910910
(NRFX_PPIB_00_10_CHANNELS_USED_BY_BT_CTLR | NRFX_PPIB_00_10_CHANNELS_USED_BY_802154_DRV | \
@@ -934,4 +934,13 @@ BUILD_ASSERT((NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV &
934934
(NRFX_PPIB_020_030_CHANNELS_USED_BY_BT_CTLR | \
935935
NRFX_PPIB_020_030_CHANNELS_USED_BY_802154_DRV | NRFX_PPIB_020_030_CHANNELS_USED_BY_MPSL)
936936

937+
#if defined(CONFIG_SOFTDEVICE)
938+
#include <nrf_sd_def.h>
939+
#define NRFX_PPI_CHANNELS_USED_BY_SD SD_PPI_CHANNELS_USED
940+
#define NRFX_PPI_GROUPS_USED_BY_SD SD_PPI_GROUPS_USED
941+
#else
942+
#define NRFX_PPI_CHANNELS_USED_BY_SD 0
943+
#define NRFX_PPI_GROUPS_USED_BY_SD 0
944+
#endif
945+
937946
#endif /* NRFX_CONFIG_RESERVED_RESOURCES_H__ */

0 commit comments

Comments
 (0)