modules: hal_nordic: nrfx: cleanup
* Move all KConfig configuration from CMake to `nrfx_kconfig.h` * Move macro utils from `nrfx_kconfig.h` to `nrfx_zephyr_utils.h` * Move GRTC channels allocation from `nrfx_kconfig.h` to `nrfx_reserved_resources.h` Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
This commit is contained in:
Marcin Szymczyk
Benjamin Cabé
parent
aa3f78791d
commit
94589b784b
8 changed files with 187 additions and 108 deletions
|
|
@ -188,16 +188,6 @@ if(CONFIG_SOC_NRF54L_CPUAPP_COMMON)
|
|||
zephyr_compile_definitions("NRF_CONFIG_CPU_FREQ_MHZ=${clock_frequency_mhz}")
|
||||
endif()
|
||||
|
||||
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG NRF_SKIP_CLOCK_CONFIGURATION)
|
||||
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_DISABLE_FICR_TRIMCNF NRF_DISABLE_FICR_TRIMCNF)
|
||||
zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE NRF_SKIP_GLITCHDETECTOR_DISABLE)
|
||||
|
||||
# Inject code to skip TAMPC setup for nRF54L20 and nRF54L09. It is not supported for now.
|
||||
# It needs to be removed when support is provided.
|
||||
if(CONFIG_SOC_NRF54L20_ENGA_CPUAPP OR CONFIG_SOC_NRF54L09_ENGA_CPUAPP)
|
||||
zephyr_compile_definitions(NRF_SKIP_TAMPC_SETUP)
|
||||
endif()
|
||||
|
||||
if(CONFIG_SOC_COMPATIBLE_NRF54LX AND CONFIG_NRFX_GPPI)
|
||||
zephyr_library_sources(${HELPERS_DIR}/nrfx_gppi_dppi_ppib_lumos.c)
|
||||
zephyr_library_sources(${NRFX_DIR}/soc/interconnect/dppic_ppib/nrfx_interconnect_dppic_ppib.c)
|
||||
|
|
|
|||
|
|
@ -12,9 +12,22 @@
|
|||
#define NRFX_CONFIG_API_VER_MINOR 8
|
||||
#define NRFX_CONFIG_API_VER_MICRO 0
|
||||
|
||||
/* Macros used in zephyr-specific config files. */
|
||||
#include "nrfx_zephyr_utils.h"
|
||||
|
||||
/* Define nrfx configuration based on Zephyrs KConfigs. */
|
||||
#include "nrfx_kconfig.h"
|
||||
|
||||
/* Define resources reserved outside nrfx scope. */
|
||||
#ifdef CONFIG_NRFX_RESERVED_RESOURCES_HEADER
|
||||
#include CONFIG_NRFX_RESERVED_RESOURCES_HEADER
|
||||
#endif
|
||||
|
||||
/* Include babble-sim configuration. */
|
||||
#if defined(CONFIG_SOC_SERIES_BSIM_NRFXX)
|
||||
#include "nrfx_config_bsim.h"
|
||||
#endif
|
||||
|
||||
/* Use defaults for undefined symbols. */
|
||||
#include <templates/nrfx_config_common.h>
|
||||
#if defined(NRF51)
|
||||
|
|
|
|||
|
|
@ -312,14 +312,6 @@ void nrfx_busy_wait(uint32_t usec_to_wait);
|
|||
(void)size; \
|
||||
} while (0)
|
||||
|
||||
/*------------------------------------------------------------------------------*/
|
||||
|
||||
#ifdef CONFIG_NRFX_RESERVED_RESOURCES_HEADER
|
||||
#include CONFIG_NRFX_RESERVED_RESOURCES_HEADER
|
||||
#endif
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* @brief Function helping to integrate nrfx IRQ handlers with IRQ_CONNECT.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -7,9 +7,6 @@
|
|||
#ifndef NRFX_KCONFIG_H__
|
||||
#define NRFX_KCONFIG_H__
|
||||
|
||||
#include <zephyr/devicetree.h>
|
||||
#include <zephyr/sys/util_macro.h>
|
||||
|
||||
/*
|
||||
* These are mappings of Kconfig options enabling nrfx drivers and particular
|
||||
* peripheral instances to the corresponding symbols used inside of nrfx.
|
||||
|
|
@ -967,85 +964,31 @@
|
|||
CONFIG_NRF52_ANOMALY_109_WORKAROUND_EGU_INSTANCE
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SOC_SERIES_BSIM_NRFXX)
|
||||
#include "nrfx_config_bsim.h"
|
||||
#ifdef CONFIG_SOC_NRF54LX_SKIP_CLOCK_CONFIG
|
||||
#define NRF_SKIP_CLOCK_CONFIGURATION
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SOC_NRF54LX_DISABLE_FICR_TRIMCNF
|
||||
#define NRF_DISABLE_FICR_TRIMCNF
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE
|
||||
#define NRF_SKIP_GLITCHDETECTOR_DISABLE
|
||||
#endif
|
||||
|
||||
/*
|
||||
* For chips with TrustZone support, MDK provides CMSIS-Core peripheral
|
||||
* accessing symbols in two flavors, with secure and non-secure base address
|
||||
* mappings. Their names contain the suffix _S or _NS, respectively.
|
||||
* Because nrfx HALs and drivers require these peripheral accessing symbols
|
||||
* without any suffixes, the following macro is provided that will translate
|
||||
* their names according to the kind of the target that is built.
|
||||
* Inject code to skip TAMPC setup for nRF54L20 and nRF54L09. It is not supported for now.
|
||||
* It needs to be removed when support is provided.
|
||||
*/
|
||||
#if defined(NRF_TRUSTZONE_NONSECURE)
|
||||
#define NRF_PERIPH(P) P##_NS
|
||||
#else
|
||||
#define NRF_PERIPH(P) P##_S
|
||||
#if defined(CONFIG_SOC_NRF54L20_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L09_ENGA_CPUAPP)
|
||||
#define NRF_SKIP_TAMPC_SETUP
|
||||
#endif
|
||||
|
||||
#define NRFX_CONFIG_BIT_DT(node_id, prop, idx) BIT(DT_PROP_BY_IDX(node_id, prop, idx))
|
||||
#define NRFX_CONFIG_MASK_DT(node_id, prop) \
|
||||
(COND_CODE_1(DT_NODE_HAS_PROP(node_id, prop), \
|
||||
(DT_FOREACH_PROP_ELEM_SEP(node_id, prop, NRFX_CONFIG_BIT_DT, (|))), \
|
||||
(0)))
|
||||
|
||||
/* If the GRTC system timer driver is to be used, prepare definitions required
|
||||
* by the nrfx_grtc driver (NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK and
|
||||
* NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS) based on information from devicetree.
|
||||
*/
|
||||
#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc)
|
||||
#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \
|
||||
(NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \
|
||||
~NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), child_owned_channels))
|
||||
#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \
|
||||
(DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \
|
||||
DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), child_owned_channels, 0))
|
||||
#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) */
|
||||
|
||||
/* If global of local DPPIC peripherals are used, provide the following macro
|
||||
* definitions required by the interconnect/apb layer:
|
||||
* - NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
|
||||
* - NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
|
||||
* - NRFX_DPPI_PUB_OR_SUB_MASK(inst_num)
|
||||
* - NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
|
||||
* - NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE
|
||||
* - NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE
|
||||
* based on information from devicetree.
|
||||
*/
|
||||
#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || \
|
||||
DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_local)
|
||||
#ifndef NRFX_DPPI_ENABLED
|
||||
#define NRFX_DPPI_ENABLED 1
|
||||
#endif
|
||||
/* Source (publish) channels masks generation. */
|
||||
#define NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
|
||||
NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels)
|
||||
|
||||
/* Sink (subscribe) channels masks generation. */
|
||||
#define NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
|
||||
NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels)
|
||||
|
||||
#define NRFX_DPPI_PUB_OR_SUB_MASK(inst_num) \
|
||||
UTIL_OR(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels), \
|
||||
DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels))
|
||||
|
||||
/* Variables names generation. */
|
||||
#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
|
||||
#define NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num) \
|
||||
NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(DT_NODELABEL(_CONCAT(dppic, inst_num)))
|
||||
|
||||
/* Variables entries generation. */
|
||||
#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY(node_id) \
|
||||
static nrfx_atomic_t NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) \
|
||||
__attribute__((used)) = \
|
||||
NRFX_CONFIG_MASK_DT(node_id, source_channels) | \
|
||||
NRFX_CONFIG_MASK_DT(node_id, sink_channels);
|
||||
#define NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE \
|
||||
DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_global, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
|
||||
#define NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE \
|
||||
DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_local, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
|
||||
#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || ... */
|
||||
|
||||
/* If local or global DPPIC peripherals are used, provide the following macro
|
||||
|
|
|
|||
|
|
@ -31,6 +31,19 @@
|
|||
*/
|
||||
#define NRFX_TIMERS_USED 0
|
||||
|
||||
/* If the GRTC system timer driver is to be used, prepare definitions required
|
||||
* by the nrfx_grtc driver (NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK and
|
||||
* NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS) based on information from devicetree.
|
||||
*/
|
||||
#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc)
|
||||
#define NRFX_GRTC_CONFIG_ALLOWED_CC_CHANNELS_MASK \
|
||||
(NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), owned_channels) & \
|
||||
~NRFX_CONFIG_MASK_DT(DT_INST(0, nordic_nrf_grtc), child_owned_channels))
|
||||
#define NRFX_GRTC_CONFIG_NUM_OF_CC_CHANNELS \
|
||||
(DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), owned_channels, 0) - \
|
||||
DT_PROP_LEN_OR(DT_INST(0, nordic_nrf_grtc), child_owned_channels, 0))
|
||||
#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_grtc) */
|
||||
|
||||
/*
|
||||
* The enabled Bluetooth controller subsystem is responsible for providing
|
||||
* definitions of the BT_CTLR_USED_* symbols used below in a file named
|
||||
|
|
@ -40,34 +53,32 @@
|
|||
*/
|
||||
#if defined(CONFIG_BT_LL_SW_SPLIT)
|
||||
#include <bt_ctlr_used_resources.h>
|
||||
#if defined(DPPI_PRESENT)
|
||||
#if defined(NRF53_SERIES)
|
||||
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
|
||||
#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
|
||||
#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_GROUPS
|
||||
#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
|
||||
#define NRFX_DPPI0_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
|
||||
#define NRFX_DPPI0_GROUPS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_GROUPS
|
||||
#elif defined(NRF54L_SERIES)
|
||||
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
|
||||
#define NRFX_DPPI10_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
|
||||
#define NRFX_DPPI10_GROUPS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_GROUPS
|
||||
#endif
|
||||
#else /* defined(DPPI_PRESENT) */
|
||||
#define NRFX_PPI_CHANNELS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_CHANNELS
|
||||
#define NRFX_PPI_GROUPS_USED_BY_BT_CTLR BT_CTLR_USED_PPI_GROUPS
|
||||
#endif /* defined(DPPI_PRESENT) */
|
||||
#endif /* defined(CONFIG_BT_LL_SW_SPLIT) */
|
||||
|
||||
#if defined(CONFIG_NRF_802154_RADIO_DRIVER)
|
||||
#if defined(NRF52_SERIES)
|
||||
#if defined(CONFIG_SOC_COMPATIBLE_NRF52X)
|
||||
#include <../src/nrf_802154_peripherals_nrf52.h>
|
||||
#define NRFX_PPI_CHANNELS_USED_BY_802154_DRV NRF_802154_PPI_CHANNELS_USED_MASK
|
||||
#define NRFX_PPI_GROUPS_USED_BY_802154_DRV NRF_802154_PPI_GROUPS_USED_MASK
|
||||
#elif defined(NRF53_SERIES)
|
||||
#elif defined(CONFIG_SOC_COMPATIBLE_NRF53X)
|
||||
#include <../src/nrf_802154_peripherals_nrf53.h>
|
||||
#define NRFX_DPPI0_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
|
||||
#define NRFX_DPPI0_GROUPS_USED_BY_802154_DRV NRF_802154_DPPI_GROUPS_USED_MASK
|
||||
#elif defined(NRF54L_SERIES)
|
||||
#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX)
|
||||
#include <../src/nrf_802154_peripherals_nrf54l.h>
|
||||
#define NRFX_DPPI10_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
|
||||
#define NRFX_DPPI10_GROUPS_USED_BY_802154_DRV NRF_802154_DPPI_GROUPS_USED_MASK
|
||||
#elif defined(NRF54H_SERIES)
|
||||
#elif defined(CONFIG_SOC_SERIES_NRF54HX)
|
||||
#include <../src/nrf_802154_peripherals_nrf54h.h>
|
||||
#define NRFX_DPPI020_CHANNELS_USED_BY_802154_DRV NRF_802154_DPPI_CHANNELS_USED_MASK
|
||||
#define NRFX_DPPI020_GROUPS_USED_BY_802154_DRV NRF_802154_DPPI_GROUPS_USED_MASK
|
||||
|
|
|
|||
132
modules/hal_nordic/nrfx/nrfx_zephyr_utils.h
Normal file
132
modules/hal_nordic/nrfx/nrfx_zephyr_utils.h
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
/*
|
||||
* Copyright (c) 2024, Nordic Semiconductor ASA
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#ifndef NRFX_ZEPHYR_UTILS_H__
|
||||
#define NRFX_ZEPHYR_UTILS_H__
|
||||
|
||||
#include <zephyr/devicetree.h>
|
||||
#include <zephyr/sys/util_macro.h>
|
||||
|
||||
/*
|
||||
* For chips with TrustZone support, MDK provides CMSIS-Core peripheral
|
||||
* accessing symbols in two flavors, with secure and non-secure base address
|
||||
* mappings. Their names contain the suffix _S or _NS, respectively.
|
||||
* Because nrfx HALs and drivers require these peripheral accessing symbols
|
||||
* without any suffixes, the following macro is provided that will translate
|
||||
* their names according to the kind of the target that is built.
|
||||
*/
|
||||
#if defined(NRF_TRUSTZONE_NONSECURE)
|
||||
#define NRF_PERIPH(P) P##_NS
|
||||
#else
|
||||
#define NRF_PERIPH(P) P##_S
|
||||
#endif
|
||||
|
||||
#define NRFX_CONFIG_BIT_DT(node_id, prop, idx) BIT(DT_PROP_BY_IDX(node_id, prop, idx))
|
||||
#define NRFX_CONFIG_MASK_DT(node_id, prop) \
|
||||
(COND_CODE_1(DT_NODE_HAS_PROP(node_id, prop), \
|
||||
(DT_FOREACH_PROP_ELEM_SEP(node_id, prop, NRFX_CONFIG_BIT_DT, (|))), \
|
||||
(0)))
|
||||
|
||||
/* If global of local DPPIC peripherals are used, provide the following macro
|
||||
* definitions required by the interconnect/apb layer:
|
||||
* - NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
|
||||
* - NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
|
||||
* - NRFX_DPPI_PUB_OR_SUB_MASK(inst_num)
|
||||
* - NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
|
||||
* - NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE
|
||||
* - NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE
|
||||
* based on information from devicetree.
|
||||
*/
|
||||
#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || \
|
||||
DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_local)
|
||||
/* Source (publish) channels masks generation. */
|
||||
#define NRFX_DPPI_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
|
||||
NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels)
|
||||
|
||||
/* Sink (subscribe) channels masks generation. */
|
||||
#define NRFX_DPPI_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
|
||||
NRFX_CONFIG_MASK_DT(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels)
|
||||
|
||||
#define NRFX_DPPI_PUB_OR_SUB_MASK(inst_num) \
|
||||
UTIL_OR(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), source_channels), \
|
||||
DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(dppic, inst_num)), sink_channels))
|
||||
|
||||
/* Variables names generation. */
|
||||
#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
|
||||
#define NRFX_DPPI_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num) \
|
||||
NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(DT_NODELABEL(_CONCAT(dppic, inst_num)))
|
||||
|
||||
/* Variables entries generation. */
|
||||
#define NRFX_CONFIG_DPPI_CHANNELS_ENTRY(node_id) \
|
||||
static nrfx_atomic_t NRFX_CONFIG_DPPI_CHANNELS_ENTRY_NAME(node_id) \
|
||||
__attribute__((used)) = \
|
||||
NRFX_CONFIG_MASK_DT(node_id, source_channels) | \
|
||||
NRFX_CONFIG_MASK_DT(node_id, sink_channels);
|
||||
#define NRFX_INTERCONNECT_APB_GLOBAL_DPPI_DEFINE \
|
||||
DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_global, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
|
||||
#define NRFX_INTERCONNECT_APB_LOCAL_DPPI_DEFINE \
|
||||
DT_FOREACH_STATUS_OKAY(nordic_nrf_dppic_local, NRFX_CONFIG_DPPI_CHANNELS_ENTRY)
|
||||
#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_dppic_global) || ... */
|
||||
|
||||
/* If local or global DPPIC peripherals are used, provide the following macro
|
||||
* definitions required by the interconnect/ipct layer:
|
||||
* - NRFX_IPCTx_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
|
||||
* - NRFX_IPCTx_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num)
|
||||
* - NRFX_IPCT_PUB_OR_SUB_MASK(inst_num)
|
||||
* - NRFX_IPCTx_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num)
|
||||
* - NRFX_INTERCONNECT_IPCT_GLOBAL_DEFINE
|
||||
* - NRFX_INTERCONNECT_IPCT_LOCAL_DEFINE
|
||||
* based on information from devicetree.
|
||||
*/
|
||||
#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_global) || \
|
||||
DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_local)
|
||||
/* Channels masks generation. */
|
||||
#define NRFX_CONFIG_IPCT_MASK_DT(node_id) \
|
||||
COND_CODE_1(DT_NODE_HAS_PROP(node_id, owned_channels), \
|
||||
(NRFX_CONFIG_MASK_DT(node_id, owned_channels)), \
|
||||
(COND_CODE_1(DT_NODE_HAS_COMPAT(node_id, nordic_nrf_ipct_local), \
|
||||
(BIT_MASK(DT_PROP(node_id, channels))), (0))))
|
||||
|
||||
#if defined(NRF_APPLICATION)
|
||||
#define NRFX_CONFIG_IPCT_LOCAL_NODE DT_NODELABEL(cpuapp_ipct)
|
||||
#elif defined(NRF_RADIOCORE)
|
||||
#define NRFX_CONFIG_IPCT_LOCAL_NODE DT_NODELABEL(cpurad_ipct)
|
||||
#endif
|
||||
#define NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num) \
|
||||
COND_CODE_1(IS_EMPTY(inst_num), \
|
||||
(NRFX_CONFIG_IPCT_LOCAL_NODE), \
|
||||
(DT_NODELABEL(_CONCAT(ipct, inst_num))))
|
||||
|
||||
#define NRFX_IPCTx_PUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
|
||||
NRFX_CONFIG_IPCT_MASK_DT(NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num))
|
||||
|
||||
#define NRFX_IPCTx_SUB_CONFIG_ALLOWED_CHANNELS_MASK_BY_INST_NUM(inst_num) \
|
||||
NRFX_CONFIG_IPCT_MASK_DT(NRFX_CONFIG_IPCT_NODE_BY_INST_NUM(inst_num))
|
||||
|
||||
#define NRFX_IPCT_PUB_OR_SUB_MASK(inst_num) \
|
||||
COND_CODE_1(IS_EMPTY(inst_num), \
|
||||
(DT_NODE_HAS_STATUS_OKAY(NRFX_CONFIG_IPCT_LOCAL_NODE)), \
|
||||
(DT_NODE_HAS_PROP(DT_NODELABEL(_CONCAT(ipct, inst_num)), owned_channels)))
|
||||
|
||||
/* Variables names generation. */
|
||||
#define NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(node_id) _CONCAT(_CONCAT(m_, node_id), _channels)
|
||||
#define NRFX_IPCTx_CHANNELS_SINGLE_VAR_NAME_BY_INST_NUM(inst_num) \
|
||||
COND_CODE_1(IS_EMPTY(inst_num), \
|
||||
(NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(NRFX_CONFIG_IPCT_LOCAL_NODE)), \
|
||||
(NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(DT_NODELABEL(_CONCAT(ipct, inst_num)))))
|
||||
|
||||
/* Variables entries generation. */
|
||||
#define NRFX_CONFIG_IPCT_CHANNELS_ENTRY(node_id) \
|
||||
static nrfx_atomic_t NRFX_CONFIG_IPCT_CHANNELS_ENTRY_NAME(node_id) \
|
||||
__attribute__((used)) = \
|
||||
NRFX_CONFIG_IPCT_MASK_DT(node_id);
|
||||
#define NRFX_INTERCONNECT_IPCT_LOCAL_DEFINE \
|
||||
DT_FOREACH_STATUS_OKAY(nordic_nrf_ipct_local, NRFX_CONFIG_IPCT_CHANNELS_ENTRY)
|
||||
#define NRFX_INTERCONNECT_IPCT_GLOBAL_DEFINE \
|
||||
DT_FOREACH_STATUS_OKAY(nordic_nrf_ipct_global, NRFX_CONFIG_IPCT_CHANNELS_ENTRY)
|
||||
#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_ipct_global) || ... */
|
||||
|
||||
#endif /* NRFX_ZEPHYR_UTILS_H__ */
|
||||
|
|
@ -12,10 +12,10 @@
|
|||
* conditionally compile them based on feature Kconfig defines in those
|
||||
* resources header file.
|
||||
*/
|
||||
#ifdef DPPI_PRESENT
|
||||
#include "../radio/radio_nrf5_dppi_resources.h"
|
||||
#else
|
||||
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
|
||||
#include "../radio/radio_nrf5_ppi_resources.h"
|
||||
#else
|
||||
#include "../radio/radio_nrf5_dppi_resources.h"
|
||||
#endif
|
||||
|
||||
/* Mask with all (D)PPI channels used by the bluetooth controller. */
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
#endif
|
||||
|
||||
#if defined(CONFIG_BT_CTLR_DF_PHYEND_OFFSET_COMPENSATION_ENABLE)
|
||||
#ifdef DPPI_PRESENT
|
||||
#if !defined(CONFIG_SOC_SERIES_NRF51X) && !defined(CONFIG_SOC_COMPATIBLE_NRF52X)
|
||||
#define HAL_USED_PPI_CHANNELS_7 \
|
||||
(BIT(HAL_SW_SWITCH_TIMER_PHYEND_DELAY_COMPENSATION_DISABLE_PPI))
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -74,16 +74,14 @@
|
|||
/* Include RTC/GRTC Compare Index used to Trigger Radio TXEN/RXEN */
|
||||
#include "hal/cntr.h"
|
||||
|
||||
#if defined(PPI_PRESENT)
|
||||
#if defined(CONFIG_SOC_SERIES_NRF51X) || defined(CONFIG_SOC_COMPATIBLE_NRF52X)
|
||||
#include <hal/nrf_ppi.h>
|
||||
#include "radio_nrf5_ppi_resources.h"
|
||||
#include "radio_nrf5_ppi.h"
|
||||
#elif defined(DPPI_PRESENT)
|
||||
#else
|
||||
#include <hal/nrf_dppi.h>
|
||||
#include "radio_nrf5_dppi_resources.h"
|
||||
#include "radio_nrf5_dppi.h"
|
||||
#else
|
||||
#error "PPI or DPPI abstractions missing."
|
||||
#endif
|
||||
|
||||
#include "radio_nrf5_txp.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue