Mpsl alt

crypto/nrf_cc310_platform/include/nrf_cc3xx_platform_kmu.h

@@ -15,7 +15,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include "nrf.h"
+#include "nrfx.h"
 
 #if defined(NRF91_SERIES) || defined(NRF5340_XXAA_APPLICATION)
 

crypto/nrf_cc312_platform/include/nrf_cc3xx_platform_kmu.h

@@ -15,7 +15,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include "nrf.h"
+#include "nrfx.h"
 
 #if defined(NRF91_SERIES) || defined(NRF5340_XXAA_APPLICATION)
 

gzll/include/nrf_gzll.h

@@ -12,8 +12,7 @@
 #ifndef NRF_GZLL_H__
 #define NRF_GZLL_H__
 
-#include <stdbool.h>
-#include "nrf.h"
+#include "nrfx.h"
 #include "nrf_gzll_constants.h"
 
 #ifdef __cplusplus

gzll/include/nrf_gzll_glue.h

@@ -14,8 +14,7 @@
  * File defines a set of functions and variables called by Gazell Link Layer.
  */
 
-#include <nrf.h>
-#include <nrf_peripherals.h>
+#include <nrfx.h>
 
 #ifdef __cplusplus
 extern "C" {

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
 **********************
 

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);
 
 
 /**

nrf_802154/driver/src/nrf_802154_swi.c

@@ -43,6 +43,7 @@
 
 #include <stdbool.h>
 
+#include "nrfx.h"
 #include "nrf_802154_config.h"
 #if !NRF_802154_INTERNAL_SWI_IRQ_HANDLING
 #include "nrf_802154_irq_handlers.h"

nrf_802154/driver/src/nrf_802154_utils.h

@@ -38,7 +38,7 @@
 #include "nrf_802154_assert.h"
 #include <stdint.h>
 #include "nrfx.h"
-#include <soc/nrfx_coredep.h>
+#include <lib/nrfx_coredep.h>
 
 #ifdef __STATIC_INLINE__
 #undef __STATIC_INLINE__

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.

nrf_dm/include/nrf_dm.h

@@ -17,7 +17,7 @@
 #define __NRF_DM_H_
 
 #include <stdint.h>
-#include "nrf.h"
+#include "nrfx.h"
 #include "nrf_dm_version.h"
 
 #ifdef __cplusplus

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."