aar: Add support for DPPI to AAR

Add use of DPPI to AAR if DPPI is defined.

Signed-off-by: Sletnes Bjørlo, Aurora <[email protected]>

Author: auroraslb

src/HW_models/NRF_AAR.c

@@ -12,7 +12,11 @@
 #include <stdbool.h>
 #include "time_machine_if.h"
 #include "NRF_HW_model_top.h"
+#if defined(PPI_PRESENT)
 #include "NRF_PPI.h"
+#elif defined(DPPI_PRESENT)
+#include "NRF_DPPI.h"
+#endif
 #include "irq_ctrl.h"
 #include "irq_sources.h"
 #include "bs_tracing.h"
@@ -40,7 +44,16 @@ static int nrf_aar_resolve(int *good_irk);
 
 static void signal_EVENTS_END(){
   NRF_AAR_regs.EVENTS_END = 1;
+
+#if !defined(DPPI_PRESENT)
   nrf_ppi_event(AAR_EVENTS_END);
+#else
+  if (NRF_AAR_regs.PUBLISH_END & AAR_PUBLISH_END_EN_Msk)
+  {
+    uint8_t channel  = NRF_AAR_regs.PUBLISH_END & AAR_PUBLISH_END_CHIDX_Msk;
+    nrf_dppi_publish(channel);
+  }
+#endif
 
   if (AAR_INTEN & AAR_INTENSET_END_Msk){
     hw_irq_ctrl_set_irq(NRF5_IRQ_CCM_AAR_IRQn);
@@ -49,7 +62,16 @@ static void signal_EVENTS_END(){
 
 static void signal_EVENTS_RESOLVED(){
   NRF_AAR_regs.EVENTS_RESOLVED = 1;
+
+#if !defined(DPPI_PRESENT)
   nrf_ppi_event(AAR_EVENTS_RESOLVED);
+#else
+  if (NRF_AAR_regs.PUBLISH_RESOLVED & AAR_PUBLISH_RESOLVED_EN_Msk)
+  {
+    uint8_t channel  = NRF_AAR_regs.PUBLISH_RESOLVED & AAR_PUBLISH_RESOLVED_CHIDX_Msk;
+    nrf_dppi_publish(channel);
+  }
+#endif
 
   if (AAR_INTEN & AAR_INTENCLR_RESOLVED_Msk){
     hw_irq_ctrl_set_irq(NRF5_IRQ_CCM_AAR_IRQn);
@@ -58,7 +80,16 @@ static void signal_EVENTS_RESOLVED(){
 
 static void signal_EVENTS_NOTRESOLVED(){
   NRF_AAR_regs.EVENTS_NOTRESOLVED = 1;
+
+#if !defined(DPPI_PRESENT)
   nrf_ppi_event(AAR_EVENTS_NOTRESOLVED);
+#else
+  if (NRF_AAR_regs.PUBLISH_NOTRESOLVED & AAR_PUBLISH_NOTRESOLVED_EN_Msk)
+  {
+    uint8_t channel  = NRF_AAR_regs.PUBLISH_NOTRESOLVED & AAR_PUBLISH_NOTRESOLVED_CHIDX_Msk;
+    nrf_dppi_publish(channel);
+  }
+#endif
 
   if (AAR_INTEN & AAR_INTENCLR_NOTRESOLVED_Msk){
     hw_irq_ctrl_set_irq(NRF5_IRQ_CCM_AAR_IRQn);

src/nrfx/hal/nrf_aar.c

@@ -9,6 +9,9 @@
 #include "hal/nrf_aar.h"
 #include "bs_tracing.h"
 #include "NRF_AAR.h"
+#if defined(DPPI_PRESENT)
+#include "NRF_DPPI.h"
+#endif
 
 void nrf_aar_int_enable(NRF_AAR_Type * p_reg, uint32_t mask)
 {
@@ -34,3 +37,52 @@ void nrf_aar_task_trigger(NRF_AAR_Type * p_reg, nrf_aar_task_t task)
     bs_trace_error_line_time("Not supported task started in nrf_aar\n");
   }
 }
+
+#if defined(DPPI_PRESENT)
+void nrf_aar_subscriber_add(nrf_aar_task_t task, uint8_t channel)
+{
+  switch(task)
+  {
+    case NRF_AAR_TASK_START:
+      nrf_dppi_subscriber_add(channel, nrf_aar_TASK_START);
+      break;
+    case NRF_AAR_TASK_STOP:
+      nrf_dppi_subscriber_add(channel, nrf_aar_TASK_STOP);
+      break;
+    default:
+      break;
+  }
+}
+
+void nrf_aar_subscriber_remove(nrf_aar_task_t task)
+{
+  switch(task)
+  {
+    case NRF_AAR_TASK_START:
+      nrf_dppi_subscriber_remove(nrf_aar_TASK_START);
+      break;
+    case NRF_AAR_TASK_STOP:
+      nrf_dppi_subscriber_remove(nrf_aar_TASK_STOP);
+      break;
+    default:
+      break;
+  }
+}
+
+NRF_STATIC_INLINE void nrf_aar_subscribe_set(NRF_AAR_Type * p_reg,
+                                             nrf_aar_task_t task,
+                                             uint8_t          channel)
+{
+  *((volatile uint32_t *) ((uint8_t *) p_reg + (uint32_t) task + 0x80uL)) =
+            ((uint32_t)channel | AAR_SUBSCRIBE_START_EN_Msk);
+  nrf_aar_subscriber_add(task, channel);
+}
+
+NRF_STATIC_INLINE void nrf_aar_subscribe_clear(NRF_AAR_Type * p_reg,
+                                               nrf_aar_task_t task)
+{
+  *((volatile uint32_t *) ((uint8_t *) p_reg + (uint32_t) task + 0x80uL)) = 0;
+  nrf_aar_subscriber_remove(task);
+}
+
+#endif // defined(DPPI_PRESENT)