Fix interrupt mask to block in SPI library

ggajoch · sandeepmistry · commit 2facbf6177ef · 2018-03-20T11:07:43.000-04:00
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
@@ -105,7 +105,7 @@ void SPIClass::usingInterrupt(int interruptNumber)
   else
   {
     interruptMode |= SPI_IMODE_EXTINT;
-    interruptMask |= (1 << interruptNumber);
+    interruptMask |= (1 << g_APinDescription[interruptNumber].ulExtInt);
   }
 
   if (irestore)
@@ -123,7 +123,7 @@ void SPIClass::notUsingInterrupt(int interruptNumber)
   uint8_t irestore = interruptsStatus();
   noInterrupts();
 
-  interruptMask &= ~(1 << interruptNumber);
+  interruptMask &= ~(1 << g_APinDescription[interruptNumber].ulExtInt);
 
   if (interruptMask == 0)
     interruptMode = SPI_IMODE_NONE;

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ void SPIClass::usingInterrupt(int interruptNumber)`
`105`	`105`	`else`
`106`	`106`	`{`
`107`	`107`	`interruptMode \|= SPI_IMODE_EXTINT;`
`108`		`- interruptMask \|= (1 << interruptNumber);`
	`108`	`+ interruptMask \|= (1 << g_APinDescription[interruptNumber].ulExtInt);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`if (irestore)`
`@@ -123,7 +123,7 @@ void SPIClass::notUsingInterrupt(int interruptNumber)`
`123`	`123`	`uint8_t irestore = interruptsStatus();`
`124`	`124`	`noInterrupts();`
`125`	`125`
`126`		`- interruptMask &= ~(1 << interruptNumber);`
	`126`	`+ interruptMask &= ~(1 << g_APinDescription[interruptNumber].ulExtInt);`
`127`	`127`
`128`	`128`	`if (interruptMask == 0)`
`129`	`129`	`interruptMode = SPI_IMODE_NONE;`