nrfx: Allow use of drivers from original nrfx

Import some more stuff from original nrfx_common.h and change the order
of include directories, to make it possible to override only certain
nrfx files (in particular, HAL and MDK) with their modified versions
from this repository while using other ones (like drivers) in their
original form, directly from the hal_nordic module.

Signed-off-by: Krzysztof Chruscinski <[email protected]>
Signed-off-by: Andrzej Głąbek <[email protected]>

Author: nordic-krch

CMakeLists.txt

@@ -18,11 +18,17 @@ if(CONFIG_BOARD_NRF52_BSIM)
  https://babblesim.github.io/folder_structure_and_env.html")
   endif()
 
+  # These include directories must be added before those from the hal_nordic
+  # module, so that the local modified versions of nrfx files are used instead
+  # of those from the original nrfx.
+  target_include_directories(zephyr_interface BEFORE INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/nrfx/
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/nrfx/hal/
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/nrfx/mdk/
+  )
+
   zephyr_include_directories(
-    src/
-    src/nrfx/hal/
-    src/nrfx/mdk
-    src/nrfx/
     src/HW_models/
   )
 

src/nrfx/drivers/nrfx_common.h

@@ -50,6 +50,21 @@
 extern "C" {
 #endif
 
+/*
+ * Suppress use of anomaly workarounds in nrfx drivers that would directly
+ * access hardware registers.
+ */
+#define USE_WORKAROUND_FOR_ANOMALY_132 0
+
+/*
+ * When nrfx drivers are compiled for a real SoC, this macro is inherited from
+ * CMSIS. The below definition is needed when those drivers are compiled for
+ * the simulated target.
+ */
+#ifndef __STATIC_INLINE
+#define __STATIC_INLINE static inline
+#endif
+
 #ifndef NRFX_STATIC_INLINE
 #ifdef NRFX_DECLARE_ONLY
 #define NRFX_STATIC_INLINE
@@ -170,6 +185,29 @@ extern "C" {
  */
 #define NRFX_OFFSETOF(type, member)  ((size_t)&(((type *)0)->member))
 
+/**
+ * @brief Macro for waiting until condition is met.
+ *
+ * @param[in]  condition Condition to meet.
+ * @param[in]  attempts  Maximum number of condition checks. Must not be 0.
+ * @param[in]  delay_us  Delay between consecutive checks, in microseconds.
+ * @param[out] result    Boolean variable to store the result of the wait process.
+ *                       Set to true if the condition is met or false otherwise.
+ */
+#define NRFX_WAIT_FOR(condition, attempts, delay_us, result) \
+do {                                                         \
+    result =  false;                                         \
+    uint32_t remaining_attempts = (attempts);                \
+    do {                                                     \
+           if (condition)                                    \
+           {                                                 \
+               result =  true;                               \
+               break;                                        \
+           }                                                 \
+           NRFX_DELAY_US(delay_us);                          \
+    } while (--remaining_attempts);                          \
+} while(0)
+
 unsigned int nrfx_peripheral_from_base_address(void const * p_reg);
 
 /**
@@ -199,6 +237,11 @@ unsigned int nrfx_peripheral_from_base_address(void const * p_reg);
  */
 #define NRFX_IRQ_NUMBER_GET(base_addr)  NRFX_PERIPHERAL_ID_GET(base_addr)
 
+/**
+ * @brief IRQ handler type.
+ */
+typedef void (*nrfx_irq_handler_t)(void);
+
 NRF_STATIC_INLINE bool nrfx_is_word_aligned(void const * p_object)
 {
     return ((((uint32_t)p_object) & 0x3u) == 0u);
@@ -215,4 +258,4 @@ NRF_STATIC_INLINE IRQn_Type nrfx_get_irq_number(void const * p_reg)
 }
 #endif
 
-#endif // NRFX_COMMON_H__
+#endif /* BS_NRFX_COMMON_H__ */

src/nrfx/hal/nrf_soc_if.h

@@ -95,7 +95,9 @@ extern void __SEV(void);
 extern void NVIC_SetPendingIRQ(IRQn_Type IRQn);
 extern void NVIC_ClearPendingIRQ(IRQn_Type IRQn);
 
+#ifndef NRFX_ASSERT
 #define NRFX_ASSERT(...)
+#endif
 
 #ifdef __cplusplus
 }