ecb: Add support for DPPI to ECB

Add use of DPPI to ECB if DPPI is defined.

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

Author: auroraslb

src/HW_models/NRF_AES_ECB.c

@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include "NRF_AES_ECB.h"
+#if defined(PPI_PRESENT)
 #include "NRF_PPI.h"
+#elif defined(DPPI_PRESENT)
+#include "NRF_DPPI.h"
+#endif
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -46,7 +50,15 @@ void nrf_aes_ecb_clean_up(){
 
 static void signal_ENDECB(){
 	NRF_ECB_regs.EVENTS_ENDECB = 1;
+#if defined(PPI_PRESENT)
 	nrf_ppi_event(ECB_EVENTS_ENDECB);
+#elif defined(DPPI_PRESENT)
+	if (NRF_ECB_regs.PUBLISH_ENDECB & ECB_PUBLISH_ENDECB_EN_Msk)
+      {
+        uint8_t channel  = NRF_ECB_regs.PUBLISH_ENDECB & ECB_PUBLISH_ENDECB_CHIDX_Msk;
+        nrf_dppi_publish(channel);
+      }
+#endif
 
 	if (ECB_INTEN & ECB_INTENSET_ENDECB_Msk){
 		hw_irq_ctrl_set_irq(NRF5_IRQ_ECB_IRQn);
@@ -55,7 +67,15 @@ static void signal_ENDECB(){
 
 static void signal_ERRORECB(){
 	NRF_ECB_regs.EVENTS_ERRORECB = 1;
+#if defined(PPI_PRESENT)
 	nrf_ppi_event(ECB_EVENTS_ERRORECB);
+#elif defined(DPPI_PRESENT)
+	if (NRF_ECB_regs.PUBLISH_ERRORECB & ECB_PUBLISH_ERRORECB_EN_Msk)
+      {
+        uint8_t channel  = NRF_ECB_regs.PUBLISH_ERRORECB & ECB_PUBLISH_ERRORECB_CHIDX_Msk;
+        nrf_dppi_publish(channel);
+      }
+#endif
 
 	if (ECB_INTEN & ECB_INTENSET_ERRORECB_Msk){
 		hw_irq_ctrl_set_irq(NRF5_IRQ_ECB_IRQn);

src/HW_models/NRF_AES_ECB.h

@@ -14,6 +14,8 @@ extern "C"{
 
 void nrf_aes_ecb_init();
 void nrf_aes_ecb_clean_up();
+void nrf_ecb_TASK_STOPECB();
+void nrf_ecb_TASK_STARTECB();
 void nrf_ecb_timer_triggered();
 void nrf_ecb_regw_sideeffects_INTENSET();
 void nrf_ecb_regw_sideeffects_INTENCLEAR();

src/nrfx/hal/nrf_ecb.c

@@ -8,6 +8,9 @@
 #include "hal/nrf_ecb.h"
 #include "bs_tracing.h"
 #include "NRF_AES_ECB.h"
+#if defined(DPPI_PRESENT)
+#include "NRF_DPPI.h"
+#endif
 
 void nrf_ecb_task_trigger(NRF_ECB_Type * p_reg, nrf_ecb_task_t task)
 {
@@ -34,3 +37,52 @@ void nrf_ecb_int_disable(NRF_ECB_Type * p_reg, uint32_t mask)
   p_reg->INTENCLR = mask;
   nrf_ecb_regw_sideeffects_INTENCLEAR();
 }
+
+#if defined(DPPI_PRESENT)
+void nrf_ecb_subscriber_add(nrf_ecb_task_t task, uint8_t channel)
+{
+  switch(task)
+  {
+    case NRF_ECB_TASK_STARTECB:
+      nrf_dppi_subscriber_add(channel, NRF_ECB_TASK_STARTECB);
+      break;
+    case NRF_ECB_TASK_STOPECB:
+      nrf_dppi_subscriber_add(channel, nrf_ecb_TASK_STOPECB);
+      break;
+    default:
+      break;
+  }
+}
+
+void nrf_ecb_subscriber_remove(nrf_ecb_task_t task)
+{
+  switch(task)
+  {
+    case NRF_ECB_TASK_STARTECB:
+      nrf_dppi_subscriber_remove(nrf_ecb_TASK_STARTECB);
+      break;
+    case NRF_ECB_TASK_STOPECB:
+      nrf_dppi_subscriber_remove(nrf_ecb_TASK_STOPECB);
+      break;
+    default:
+      break;
+  }
+}
+
+void nrf_ecb_subscribe_set(NRF_ECB_Type * p_reg,
+                           nrf_ecb_task_t task,
+                           uint8_t        channel)
+{
+  *((volatile uint32_t *) ((uint8_t *) p_reg + (uint32_t) task + 0x80uL)) =
+          ((uint32_t)channel | ECB_SUBSCRIBE_STARTECB_EN_Msk);
+  nrf_ecb_subscriber_add(task, channel);
+}
+
+void nrf_ecb_subscribe_clear(NRF_ECB_Type * p_reg,
+                             nrf_ecb_task_t task)
+{
+  *((volatile uint32_t *) ((uint8_t *) p_reg + (uint32_t) task + 0x80uL)) = 0;
+  nrf_ecb_subscriber_remove(task);
+}
+
+#endif // defined(DPPI_PRESENT)