From eb7a1b3ac9cbacb74afb7fcd1d40c51a18c90060 Mon Sep 17 00:00:00 2001
From: JF <jf@codingfield.com>
Date: Wed, 22 Jan 2020 21:08:53 +0100
Subject: [WIP] Max SPI speed reached (119ms for a full refresh. Theo max :
 240*240*16 = 115.2ms) using IRQ and DMA. Code needs some cleaning before
 integration.

---
 src/drivers/SpiMaster.cpp | 100 +++++++++++++++++++++++++++++++---------------
 1 file changed, 67 insertions(+), 33 deletions(-)

(limited to 'src/drivers/SpiMaster.cpp')

diff --git a/src/drivers/SpiMaster.cpp b/src/drivers/SpiMaster.cpp
index f7e64db6..7c6186a6 100644
--- a/src/drivers/SpiMaster.cpp
+++ b/src/drivers/SpiMaster.cpp
@@ -62,6 +62,7 @@ bool SpiMaster::Init() {
 
   NRF_SPIM0->INTENSET = ((unsigned)1 << (unsigned)6);
   NRF_SPIM0->INTENSET = ((unsigned)1 << (unsigned)1);
+  NRF_SPIM0->INTENSET = ((unsigned)1 << (unsigned)19);
 
   NRF_SPIM0->ENABLE = (SPIM_ENABLE_ENABLE_Enabled << SPIM_ENABLE_ENABLE_Pos);
 
@@ -83,34 +84,61 @@ void SpiMaster::setup_workaround_for_ftpan_58(NRF_SPIM_Type *spim, uint32_t ppi_
   NRF_PPI->CHENSET = 1U << ppi_channel;
 }
 
-
-
-void SpiMaster::irq() {
+void SpiMaster::irqStarted() {
   if(busy) {
-    if(bufferSize > 0) {
-      auto currentSize = std::min((size_t)255, bufferSize);
+    auto s = currentBufferSize;
+    if(s > 0) {
+      auto currentSize = std::min((size_t)255, s);
 
-      NRF_SPIM0->TXD.PTR = (uint32_t) bufferAddr;
+      NRF_SPIM0->TXD.PTR = (uint32_t) currentBufferAddr;
       NRF_SPIM0->TXD.MAXCNT = currentSize;
       NRF_SPIM0->TXD.LIST = 0;
 
-      bufferAddr += currentSize;
-      bufferSize -= currentSize;
+      currentBufferAddr += currentSize;
+      currentBufferSize -= currentSize;
 
       NRF_SPIM0->RXD.PTR = (uint32_t) 0;
       NRF_SPIM0->RXD.MAXCNT = 0;
       NRF_SPIM0->RXD.LIST = 0;
-      NRF_SPIM0->TASKS_START = 1;
+
+      if(repeat == 0)
+        NRF_SPIM0->SHORTS = 0;
 
       return;
     }else {
+      if(repeat > 0) {
+        repeat = repeat -1;
+
+        currentBufferAddr = bufferAddr;
+        currentBufferSize = bufferSize;
+        s = currentBufferSize;
+        auto currentSize = std::min((size_t)255, s);
+        NRF_SPIM0->TXD.PTR = (uint32_t) currentBufferAddr;
+        NRF_SPIM0->TXD.MAXCNT = currentSize;
+        NRF_SPIM0->TXD.LIST = 0;
+
+        currentBufferAddr += currentSize;
+        currentBufferSize -= currentSize;
+
+        NRF_SPIM0->RXD.PTR = (uint32_t) 0;
+        NRF_SPIM0->RXD.MAXCNT = 0;
+        NRF_SPIM0->RXD.LIST = 0;
+      }
+    }
+  }
+}
+
+void SpiMaster::irqEnd() {
+  if(busy) {
+    if(repeat == 0 && currentBufferSize == 0) {
       nrf_gpio_pin_set(pinCsn);
       busy = false;
     }
   }
 }
 
-bool SpiMaster::Write(const uint8_t *data, size_t size) {
+
+bool SpiMaster::Write(const uint8_t *data, size_t size, size_t r) {
   if(data == nullptr) return false;
 
   while(busy) {
@@ -121,7 +149,7 @@ bool SpiMaster::Write(const uint8_t *data, size_t size) {
     setup_workaround_for_ftpan_58(NRF_SPIM0, 0,0);
     NRF_SPIM0->INTENCLR = (1<<6);
     NRF_SPIM0->INTENCLR = (1<<1);
-
+    NRF_SPIM0->INTENCLR = (1<<19);
   } else {
     NRF_GPIOTE->CONFIG[0] = 0;
     NRF_PPI->CH[0].EEP = 0;
@@ -129,38 +157,38 @@ bool SpiMaster::Write(const uint8_t *data, size_t size) {
     NRF_PPI->CHENSET = 0;
     NRF_SPIM0->INTENSET = (1<<6);
     NRF_SPIM0->INTENSET = (1<<1);
+    NRF_SPIM0->INTENSET = (1<<19);
   }
 
   nrf_gpio_pin_clear(pinCsn);
 
-  bufferAddr = (uint32_t)data;
-  bufferSize = size;
+  currentBufferAddr = bufferAddr = (uint32_t)data;
+  currentBufferSize = bufferSize = size;
+  repeat = r;
   busy = true;
 
-//  while(size > 0) {
-    auto currentSize = std::min((size_t)255, bufferSize);
-    NRF_SPIM0->TXD.PTR = (uint32_t) data;
-    NRF_SPIM0->TXD.MAXCNT = currentSize;
-    NRF_SPIM0->TXD.LIST = 0;
-
-    bufferSize -= currentSize;
-    bufferAddr += currentSize;
+  if(repeat > 0)
+    NRF_SPIM0->SHORTS = (1<<17);
 
-    NRF_SPIM0->RXD.PTR = (uint32_t) 0;
-    NRF_SPIM0->RXD.MAXCNT = 0;
-    NRF_SPIM0->RXD.LIST = 0;
+  auto currentSize = std::min((size_t)255, bufferSize);
+  NRF_SPIM0->TXD.PTR = bufferAddr;
+  NRF_SPIM0->TXD.MAXCNT = currentSize;
+  NRF_SPIM0->TXD.LIST = 0;
 
-    if(size != 1) {
-      NRF_SPIM0->EVENTS_END = 0;
-    }
+  currentBufferSize -= currentSize;
+  currentBufferAddr += currentSize;
 
-    NRF_SPIM0->TASKS_START = 1;
+  NRF_SPIM0->RXD.PTR = (uint32_t) 0;
+  NRF_SPIM0->RXD.MAXCNT = 0;
+  NRF_SPIM0->RXD.LIST = 0;
+  NRF_SPIM0->EVENTS_END = 0;
+  NRF_SPIM0->TASKS_START = 1;
 
-    if(size == 1) {
-      while (NRF_SPIM0->EVENTS_END == 0);
-      busy = false;
-      nrf_gpio_pin_set(pinCsn);
-    }
+  if(size == 1) {
+    while (NRF_SPIM0->EVENTS_END == 0);
+    busy = false;
+    nrf_gpio_pin_set(pinCsn);
+  }
 
 
   return true;
@@ -187,3 +215,9 @@ void SpiMaster::Sleep() {
 void SpiMaster::Wakeup() {
   Init();
 }
+
+void SpiMaster::Wait() {
+  while(busy) {
+    asm("nop");
+  }
+}
-- 
cgit v1.2.3