WInterrupts: optimized use of digitalPinToInterrupt()

Author: cmaglie

cores/arduino/WInterrupts.c

@@ -60,7 +60,9 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   // Assign pin to EIC
   if (pinPeripheral(pin, PIO_EXTINT) != RET_STATUS_OK)
     return;
-  if (digitalPinToInterrupt(pin) == EXTERNAL_INT_NMI)
+  
+  EExt_Interrupts in = digitalPinToInterrupt(pin);
+  if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
     return;
 
   if (!enabled) {
@@ -69,17 +71,17 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   }
 
   // Assign callback to interrupt
-  callbacksInt[digitalPinToInterrupt(pin)] = callback;
+  callbacksInt[in] = callback;
 
   // Look for right CONFIG register to be addressed
-  if (digitalPinToInterrupt(pin) > EXTERNAL_INT_7) {
+  if (in > EXTERNAL_INT_7) {
     config = 1;
   } else {
     config = 0;
   }
 
   // Configure the interrupt mode
-  pos = ((digitalPinToInterrupt(pin) - (8 * config)) << 2);
+  pos = (in - (8 * config)) << 2;
   switch (mode)
   {
     case LOW:
@@ -104,20 +106,19 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   }
 
   // Enable the interrupt
-  EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << digitalPinToInterrupt(pin));
+  EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << in);
 }
 
 /*
  * \brief Turns off the given interrupt.
  */
 void detachInterrupt(uint32_t pin)
 {
-  if (digitalPinToInterrupt(pin) == NOT_AN_INTERRUPT)
-    return;
-  if (digitalPinToInterrupt(pin) == EXTERNAL_INT_NMI)
+  EExt_Interrupts in = digitalPinToInterrupt(pin);
+  if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
     return;
 
-  EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(1 << digitalPinToInterrupt(pin));
+  EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(1 << in);
 }
 
 /*