diff --git a/crypto/nrf_cc310_platform/include/nrf_cc3xx_platform_kmu.h b/crypto/nrf_cc310_platform/include/nrf_cc3xx_platform_kmu.h index 79ce770dd3..6471c9b544 100644 --- a/crypto/nrf_cc310_platform/include/nrf_cc3xx_platform_kmu.h +++ b/crypto/nrf_cc310_platform/include/nrf_cc3xx_platform_kmu.h @@ -15,7 +15,7 @@ #include #include -#include "nrf.h" +#include "nrfx.h" #if defined(NRF91_SERIES) || defined(NRF5340_XXAA_APPLICATION) diff --git a/crypto/nrf_cc312_platform/include/nrf_cc3xx_platform_kmu.h b/crypto/nrf_cc312_platform/include/nrf_cc3xx_platform_kmu.h index 79ce770dd3..6471c9b544 100644 --- a/crypto/nrf_cc312_platform/include/nrf_cc3xx_platform_kmu.h +++ b/crypto/nrf_cc312_platform/include/nrf_cc3xx_platform_kmu.h @@ -15,7 +15,7 @@ #include #include -#include "nrf.h" +#include "nrfx.h" #if defined(NRF91_SERIES) || defined(NRF5340_XXAA_APPLICATION) diff --git a/gzll/include/nrf_gzll.h b/gzll/include/nrf_gzll.h index e79aecc5e6..a5c8a9e4e1 100644 --- a/gzll/include/nrf_gzll.h +++ b/gzll/include/nrf_gzll.h @@ -12,8 +12,7 @@ #ifndef NRF_GZLL_H__ #define NRF_GZLL_H__ -#include -#include "nrf.h" +#include "nrfx.h" #include "nrf_gzll_constants.h" #ifdef __cplusplus diff --git a/gzll/include/nrf_gzll_glue.h b/gzll/include/nrf_gzll_glue.h index c39ab9862a..ee489474c8 100644 --- a/gzll/include/nrf_gzll_glue.h +++ b/gzll/include/nrf_gzll_glue.h @@ -14,8 +14,7 @@ * File defines a set of functions and variables called by Gazell Link Layer. */ -#include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/nfc/CHANGELOG.rst b/nfc/CHANGELOG.rst index 11007d538b..8650acfe82 100644 --- a/nfc/CHANGELOG.rst +++ b/nfc/CHANGELOG.rst @@ -9,6 +9,14 @@ Changelog All notable changes to this project are documented in this file. +Main branch +*********** + +Modified +======== + +* Aligned the :ref:`type_2_tag` and :ref:`type_4_tag` to the new nrfx API in version 4.0.0. + nRF Connect SDK v3.0.0 ********************** diff --git a/nfc/include/nfc_platform.h b/nfc/include/nfc_platform.h index fbfd7e632c..2776f2bb0c 100644 --- a/nfc/include/nfc_platform.h +++ b/nfc/include/nfc_platform.h @@ -61,10 +61,10 @@ typedef void (* nfc_lib_cb_resolve_t)(const void * p_ctx, const uint8_t * p_data * @param[in, out] p_irq_priority Pointer to the interrupt priority configuration. You must * set its value inside this function. * - * @retval NRFX_SUCCESS If the NFC module is initialized successfully. If one - * of the arguments is invalid, an error code is returned. + * @retval 0 If the NFC module is initialized successfully. If one + * of the arguments is invalid, an error code is returned. */ -nrfx_err_t nfc_platform_setup(nfc_lib_cb_resolve_t nfc_lib_cb_resolve, uint8_t * p_irq_priority); +int nfc_platform_setup(nfc_lib_cb_resolve_t nfc_lib_cb_resolve, uint8_t * p_irq_priority); /** @@ -75,14 +75,12 @@ nrfx_err_t nfc_platform_setup(nfc_lib_cb_resolve_t nfc_lib_cb_resolve, uint8_t * * can be used to fill the Type 2 Tag Internal Bytes. * @param[in] nfcid1_buff_len Length of the NFCID1 buffer. * - * @retval NRFX_SUCCESS The operation was successful. - * @retval NRFX_ERROR_INVALID_LENGTH Length of the NFCID buffer is different than - * NRFX_NFCT_NFCID1_SINGLE_SIZE, - * NRFX_NFCT_NFCID1_DOUBLE_SIZE, or - * NRFX_NFCT_NFCID1_TRIPLE_SIZE. + * @retval 0 The operation was successful. + * @retval -E2BIG Length of the NFCID buffer is different than NRFX_NFCT_NFCID1_SINGLE_SIZE, + * NRFX_NFCT_NFCID1_DOUBLE_SIZE, or NRFX_NFCT_NFCID1_TRIPLE_SIZE. */ -nrfx_err_t nfc_platform_nfcid1_default_bytes_get(uint8_t * const p_nfcid1_buff, - uint32_t nfcid1_buff_len); +int nfc_platform_nfcid1_default_bytes_get(uint8_t * const p_nfcid1_buff, + uint32_t nfcid1_buff_len); /** diff --git a/nfc/lib/cortex-m33/hard-float/libnfc_t2t.a b/nfc/lib/cortex-m33/hard-float/libnfc_t2t.a index 437d491d91..d3cfb69494 100644 Binary files a/nfc/lib/cortex-m33/hard-float/libnfc_t2t.a and b/nfc/lib/cortex-m33/hard-float/libnfc_t2t.a differ diff --git a/nfc/lib/cortex-m33/hard-float/libnfc_t4t.a b/nfc/lib/cortex-m33/hard-float/libnfc_t4t.a index 519833ad80..6d0b57af4a 100644 Binary files a/nfc/lib/cortex-m33/hard-float/libnfc_t4t.a and b/nfc/lib/cortex-m33/hard-float/libnfc_t4t.a differ diff --git a/nfc/lib/cortex-m33/soft-float/libnfc_t2t.a b/nfc/lib/cortex-m33/soft-float/libnfc_t2t.a index 3102e94188..28b0cd1e57 100644 Binary files a/nfc/lib/cortex-m33/soft-float/libnfc_t2t.a and b/nfc/lib/cortex-m33/soft-float/libnfc_t2t.a differ diff --git a/nfc/lib/cortex-m33/soft-float/libnfc_t4t.a b/nfc/lib/cortex-m33/soft-float/libnfc_t4t.a index 1325069880..d37671c78d 100644 Binary files a/nfc/lib/cortex-m33/soft-float/libnfc_t4t.a and b/nfc/lib/cortex-m33/soft-float/libnfc_t4t.a differ diff --git a/nfc/lib/cortex-m4/hard-float/libnfc_t2t.a b/nfc/lib/cortex-m4/hard-float/libnfc_t2t.a index f05f26247f..82b0f41d44 100644 Binary files a/nfc/lib/cortex-m4/hard-float/libnfc_t2t.a and b/nfc/lib/cortex-m4/hard-float/libnfc_t2t.a differ diff --git a/nfc/lib/cortex-m4/hard-float/libnfc_t4t.a b/nfc/lib/cortex-m4/hard-float/libnfc_t4t.a index 25eed47e15..3c4d2c41a4 100644 Binary files a/nfc/lib/cortex-m4/hard-float/libnfc_t4t.a and b/nfc/lib/cortex-m4/hard-float/libnfc_t4t.a differ diff --git a/nfc/lib/cortex-m4/soft-float/libnfc_t2t.a b/nfc/lib/cortex-m4/soft-float/libnfc_t2t.a index a9696c3388..32a44daf3b 100644 Binary files a/nfc/lib/cortex-m4/soft-float/libnfc_t2t.a and b/nfc/lib/cortex-m4/soft-float/libnfc_t2t.a differ diff --git a/nfc/lib/cortex-m4/soft-float/libnfc_t4t.a b/nfc/lib/cortex-m4/soft-float/libnfc_t4t.a index fd5ea4eec7..eb812756fd 100644 Binary files a/nfc/lib/cortex-m4/soft-float/libnfc_t4t.a and b/nfc/lib/cortex-m4/soft-float/libnfc_t4t.a differ diff --git a/nrf_802154/driver/src/nrf_802154_swi.c b/nrf_802154/driver/src/nrf_802154_swi.c index b2408d98f0..19aee83ee1 100644 --- a/nrf_802154/driver/src/nrf_802154_swi.c +++ b/nrf_802154/driver/src/nrf_802154_swi.c @@ -43,6 +43,7 @@ #include +#include "nrfx.h" #include "nrf_802154_config.h" #if !NRF_802154_INTERNAL_SWI_IRQ_HANDLING #include "nrf_802154_irq_handlers.h" diff --git a/nrf_802154/driver/src/nrf_802154_utils.h b/nrf_802154/driver/src/nrf_802154_utils.h index df93008df5..783522872b 100644 --- a/nrf_802154/driver/src/nrf_802154_utils.h +++ b/nrf_802154/driver/src/nrf_802154_utils.h @@ -38,7 +38,7 @@ #include "nrf_802154_assert.h" #include #include "nrfx.h" -#include +#include #ifdef __STATIC_INLINE__ #undef __STATIC_INLINE__ diff --git a/nrf_802154/zephyr/Kconfig.nrfxlib b/nrf_802154/zephyr/Kconfig.nrfxlib index 37664c1a2c..a3af88f728 100644 --- a/nrf_802154/zephyr/Kconfig.nrfxlib +++ b/nrf_802154/zephyr/Kconfig.nrfxlib @@ -76,12 +76,7 @@ config NRF_802154_SL select DYNAMIC_INTERRUPTS select SENSOR if NRF_802154_TEMPERATURE_UPDATE select TEMP_NRF5_MPSL if NRF_802154_TEMPERATURE_UPDATE - select NRFX_GPPI if SOC_COMPATIBLE_NRF52X || SOC_COMPATIBLE_NRF53X - select NRFX_PPI if SOC_COMPATIBLE_NRF52X - select NRFX_DPPI0 if SOC_COMPATIBLE_NRF53X || SOC_SERIES_NRF53X - select NRFX_DPPI20 if SOC_SERIES_NRF54LX - select NRFX_PPIB11 if SOC_SERIES_NRF54LX - select NRFX_PPIB21 if SOC_SERIES_NRF54LX + select NRFX_GPPI depends on !NRF_802154_SOURCE_HAL_NORDIC help Use of Nordic Semiconductor proprietary implementation of nRF 802.15.4 Service Layer. diff --git a/nrf_dm/include/nrf_dm.h b/nrf_dm/include/nrf_dm.h index b1a80db96e..54d579fbac 100644 --- a/nrf_dm/include/nrf_dm.h +++ b/nrf_dm/include/nrf_dm.h @@ -17,7 +17,7 @@ #define __NRF_DM_H_ #include -#include "nrf.h" +#include "nrfx.h" #include "nrf_dm_version.h" #ifdef __cplusplus diff --git a/softperipheral/sQSPI/include/nrf_sp_qspi.h b/softperipheral/sQSPI/include/nrf_sp_qspi.h index b52e120ee7..7bf892d3ea 100644 --- a/softperipheral/sQSPI/include/nrf_sp_qspi.h +++ b/softperipheral/sQSPI/include/nrf_sp_qspi.h @@ -7,12 +7,11 @@ #ifndef NRF_SP_QSPI_H__ #define NRF_SP_QSPI_H__ -#include "nrf.h" // Resolve nrfXX_types.h for the correct target to get definitions for __IO, __IOM etc. +#include "nrfx.h" // Resolve nrfXX_types.h for the correct target to get definitions for __IO, __IOM etc. #if defined (NRF_FLPR) extern char __soft_periph_com_start__[]; #define NRF_SP_QSPI_BASE ((uint32_t)&__soft_periph_com_start__) #elif defined (NRF_APPLICATION) -#include "nrfx_config.h" #define NRF_SP_QSPI_BASE (NRF_SQSPI_SP_FIRMWARE_ADDR + 0x3b40) #else #pragma warning "Processor not defined."