SPI: fix irqs > 32

Author: facchinm

libraries/SPI/src/SPI.cpp

@@ -62,7 +62,8 @@ void SPIClass::init()
     return;
   interruptMode = SPI_IMODE_NONE;
   interruptSave = 0;
-  interruptMask = 0;
+  interruptMask_lo = 0;
+  interruptMask_hi = 0;
   initialized = true;
 }
 
@@ -91,7 +92,11 @@ void SPIClass::usingInterrupt(int interruptNumber)
       irqMap = (uint8_t*)malloc(EXTERNAL_NUM_INTERRUPTS);
     }
     interruptMode |= SPI_IMODE_EXTINT;
-    interruptMask |= (1 << interruptNumber);
+    if (interruptNumber < 32) {
+      interruptMask_lo |= 1 << interruptNumber;
+    } else {
+      interruptMask_hi |= 1 << (interruptNumber - 32);
+    }
   }
 }
 
@@ -103,17 +108,21 @@ void SPIClass::notUsingInterrupt(int interruptNumber)
   if (interruptMode & SPI_IMODE_GLOBAL)
     return; // can't go back, as there is no reference count
 
-  interruptMask &= ~(1 << interruptNumber);
+  if (interruptNumber < 32) {
+    interruptMask_lo &= ~(1 << interruptNumber);
+  } else {
+    interruptMask_hi &= ~(1 << (interruptNumber - 32));
+  }
 
-  if (interruptMask == 0) {
+  if (interruptMask_lo == 0 && interruptMask_hi == 0) {
     interruptMode = SPI_IMODE_NONE;
     free(irqMap);
     irqMap = NULL;
   }
 }
 
 void SPIClass::detachMaskedInterrupts() {
-  unsigned long long temp = interruptMask;
+  uint64_t temp = interruptMask_lo;
   uint8_t shift = 0;
   while (temp != 0) {
     if (temp & 1) {
@@ -124,10 +133,21 @@ void SPIClass::detachMaskedInterrupts() {
     temp = temp >> 1;
     shift++;
   }
+  temp = interruptMask_hi;
+  shift = 32;
+  while (temp != 0) {
+    if (temp & 1) {
+      uint8_t* pin_ctrl_reg = getPINnCTRLregister(portToPortStruct(shift/8), shift%8);
+      irqMap[shift] = *pin_ctrl_reg;
+      *pin_ctrl_reg &= ~(PORT_ISC_gm);
+    }
+    temp = temp >> 1;
+    shift++;
+  }
 }
 
 void SPIClass::reattachMaskedInterrupts() {
-  unsigned long long temp = interruptMask;
+  uint64_t temp = interruptMask_lo;
   uint8_t shift = 0;
   while (temp != 0) {
     if (temp & 1) {
@@ -137,6 +157,16 @@ void SPIClass::reattachMaskedInterrupts() {
     temp = temp >> 1;
     shift++;
   }
+  temp = interruptMask_hi;
+  shift = 32;
+  while (temp != 0) {
+    if (temp & 1) {
+      uint8_t* pin_ctrl_reg = getPINnCTRLregister(portToPortStruct(shift/8), shift%8);
+      *pin_ctrl_reg |= irqMap[shift];
+    }
+    temp = temp >> 1;
+    shift++;
+  }
 }
 
 void SPIClass::beginTransaction(SPISettings settings)

libraries/SPI/src/SPI.h

@@ -182,7 +182,8 @@ class SPIClass {
   bool initialized;
   uint8_t interruptMode;
   char interruptSave;
-  unsigned long long interruptMask;
+  uint32_t interruptMask_lo;
+  uint32_t interruptMask_hi;
   uint8_t* irqMap = NULL;
 };