Revert "mpsl: align to nrfx 4.0"

This reverts commit 529051d.

Author: masz-nordic

mpsl/include/mpsl_clock.h

@@ -24,6 +24,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 #include "nrfx.h"
+#include "nrf_errno.h"
 #if !defined (NRF54H_SERIES)
 #include "hal/nrf_clock.h"
 #endif /* !NRF54H20_XXAA */

mpsl/include/mpsl_hwres.h

@@ -56,34 +56,24 @@ 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__)
 #if defined(NRF52_SERIES)
-#define MPSL_RESERVED_PPI_CHANNELS ((1UL << 19) | (1UL << 30) | (1UL << 31))
-#define MPSL_PPI_CHANNELS_USED_MASK MPSL_NRF52_PPI_CHANNELS_USED_MASK
+    #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)
 #elif defined(NRF53_SERIES)
     #define MPSL_RESERVED_PPI_CHANNELS ((1UL << 0) | (1UL << 1) | (1UL << 2))
-    #define MPSL_DPPIC_CHANNELS_USED_MASK MPSL_NRF53_DPPIC_CHANNELS_USED_MASK
+    /* 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 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
+    #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)
 #elif defined(NRF54H_SERIES)
     #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
+    #define MPSL_DPPIC020_CHANNELS_USED_MASK (0x00000001)
+    #define MPSL_IPCT130_CHANNELS_USED_MASK  (0x00000001)
 #else
     #error Unknown NRF series.
 #endif
@@ -98,7 +88,6 @@ extern "C" {
 #else
     #define MPSL_TIMER0 NRF_TIMER020
 #endif
-#endif
 
 #ifdef __cplusplus
 }