mpsl: align to nrfx 4.0

MDK should not be included directly, but via nrfx.h

Signed-off-by: Marcin Szymczyk <[email protected]>

Author: masz-nordic

mpsl/include/mpsl.h

@@ -22,8 +22,7 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "nrf.h"
-#include "nrf_peripherals.h"
+#include "nrfx.h"
 #include "nrf_errno.h"
 #include "mpsl_clock.h"
 #include "mpsl_hwres.h"

mpsl/include/mpsl_clock.h

@@ -23,8 +23,7 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "nrf.h"
-#include "nrf_errno.h"
+#include "nrfx.h"
 #if !defined (NRF54H_SERIES) && !defined (NRF92_SERIES)
 #include "hal/nrf_clock.h"
 #endif /* !NRF54H20_XXAA && !NRF92H20_XXAA */

mpsl/include/mpsl_hwres.h

@@ -22,45 +22,56 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "nrf.h"
-#include "nrf_peripherals.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Reserved (D)PPI, PPIB and IPCT resources for the supported platforms. */
+/* This corresponds to the PPI channels 19, 30, and 31. */
+#define MPSL_NRF52_PPI_CHANNELS_USED_MASK       (0xc0080000)
+/* This corresponds to the DPPI channels 0, 1, and 2. */
+#define MPSL_NRF53_DPPIC_CHANNELS_USED_MASK     (0x00000007)
+#define MPSL_NRF54L_DPPIC10_CHANNELS_USED_MASK  (0x00000001)
+#define MPSL_NRF54L_DPPIC20_CHANNELS_USED_MASK  (0x00000001)
+#define MPSL_NRF54L_PPIB11_CHANNELS_USED_MASK   (0x00000001)
+#define MPSL_NRF54L_PPIB21_CHANNELS_USED_MASK   (0x00000001)
+#define MPSL_NRF54H_DPPIC020_CHANNELS_USED_MASK (0x00000001)
+#define MPSL_NRF54H_IPCT130_CHANNELS_USED_MASK  (0x00000001)
+
+#if !defined(__ZEPHYR__)
+#include "nrfx.h"
+
 #if defined(NRF52_SERIES)
-    #define MPSL_RESERVED_PPI_CHANNELS ((1UL << 19) | (1UL << 30) | (1UL << 31))
-    /* This corresponds to the PPI channels 19, 30, and 31. */
-    #define MPSL_PPI_CHANNELS_USED_MASK (0xc0080000)
+#define MPSL_RESERVED_PPI_CHANNELS ((1UL << 19) | (1UL << 30) | (1UL << 31))
+#define MPSL_PPI_CHANNELS_USED_MASK MPSL_NRF52_PPI_CHANNELS_USED_MASK
 #elif defined(NRF53_SERIES)
-    #define MPSL_RESERVED_PPI_CHANNELS ((1UL << 0) | (1UL << 1) | (1UL << 2))
-    /* This corresponds to the DPPI channels 0, 1, and 2. */
-    #define MPSL_DPPIC_CHANNELS_USED_MASK (0x00000007)
-#elif defined(LUMOS_XXAA)
-    #define MPSL_RESERVED_PPI_CHANNELS (1UL << 0)
-    #define MPSL_DPPIC10_CHANNELS_USED_MASK (0x00000001)
-    #define MPSL_DPPIC20_CHANNELS_USED_MASK (0x00000001)
-    #define MPSL_PPIB11_CHANNELS_USED_MASK  (0x00000001)
-    #define MPSL_PPIB21_CHANNELS_USED_MASK  (0x00000001)
+#define MPSL_RESERVED_PPI_CHANNELS ((1UL << 0) | (1UL << 1) | (1UL << 2))
+#define MPSL_DPPIC_CHANNELS_USED_MASK MPSL_NRF53_DPPIC_CHANNELS_USED_MASK
+#elif defined(NRF54L_SERIES)
+#define MPSL_RESERVED_PPI_CHANNELS (1UL << 0)
+#define MPSL_DPPIC10_CHANNELS_USED_MASK MPSL_NRF54L_DPPIC10_CHANNELS_USED_MASK
+#define MPSL_DPPIC20_CHANNELS_USED_MASK MPSL_NRF54L_DPPIC20_CHANNELS_USED_MASK
+#define MPSL_PPIB11_CHANNELS_USED_MASK  MPSL_NRF54L_PPIB11_CHANNELS_USED_MASK
+#define MPSL_PPIB21_CHANNELS_USED_MASK  MPSL_NRF54L_PPIB21_CHANNELS_USED_MASK
 #elif defined(NRF54H_SERIES) || defined(GRTC_PRESENT)
-    #define MPSL_RESERVED_PPI_CHANNELS (1UL << 0)
-    #define MPSL_DPPIC020_CHANNELS_USED_MASK (0x00000001)
-    #define MPSL_IPCT130_CHANNELS_USED_MASK  (0x00000001)
+#define MPSL_RESERVED_PPI_CHANNELS (1UL << 0)
+#define MPSL_DPPIC020_CHANNELS_USED_MASK MPSL_NRF54H_DPPIC020_CHANNELS_USED_MASK
+#define MPSL_IPCT130_CHANNELS_USED_MASK  MPSL_NRF54H_IPCT130_CHANNELS_USED_MASK
 #else
-    #error Unknown NRF series.
+#error Unknown NRF series.
 #endif
 
 /* Defines which timer is being used by the MPSL implementation */
 #if defined(NRF52_SERIES)
-    #define MPSL_TIMER0 NRF_TIMER0
+	#define MPSL_TIMER0 NRF_TIMER0
 #elif defined(NRF53_SERIES)
-    #define MPSL_TIMER0 NRF_TIMER0_NS
-#elif defined(LUMOS_XXAA)
-    #define MPSL_TIMER0 NRF_TIMER10
+	#define MPSL_TIMER0 NRF_TIMER0_NS
+#elif defined(NRF54L_SERIES)
+	#define MPSL_TIMER0 NRF_TIMER10
 #else
-    #define MPSL_TIMER0 NRF_TIMER020
+	#define MPSL_TIMER0 NRF_TIMER020
+#endif
 #endif
 
 #if defined(DPPI_PRESENT) || defined(DOXYGEN)

mpsl/include/mpsl_timeslot.h

@@ -25,8 +25,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
-#include "nrf.h"
-#include "nrf_peripherals.h"
+#include "nrfx.h"
 #include "nrf_errno.h"
 
 /** @brief The shortest allowed timeslot event in microseconds. */