fixing beginTransaction() thread safety

smarq8 · web-flow · commit 534978df138a · 2022-03-13T17:19:45.000+01:00
diff --git a/libraries/SPI/src/SPI.cpp b/libraries/SPI/src/SPI.cpp
@@ -133,6 +133,7 @@ void SPIClass::setBitOrder(uint8_t bitOrder)
 
 void SPIClass::beginTransaction(SPISettings settings)
 {
+    spiLock(_spi);
     //check if last freq changed
     uint32_t cdiv = spiGetClockDiv(_spi);
     if(_freq != settings._clock || _div != cdiv) {
@@ -148,6 +149,7 @@ void SPIClass::endTransaction()
     if(_inTransaction){
         _inTransaction = false;
         spiEndTransaction(_spi);
+	spiUnlock(_spi);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ void SPIClass::setBitOrder(uint8_t bitOrder)`
`133`	`133`
`134`	`134`	`void SPIClass::beginTransaction(SPISettings settings)`
`135`	`135`	`{`
	`136`	`+ spiLock(_spi);`
`136`	`137`	`//check if last freq changed`
`137`	`138`	`uint32_t cdiv = spiGetClockDiv(_spi);`
`138`	`139`	`if(_freq != settings._clock \|\| _div != cdiv) {`
`@@ -148,6 +149,7 @@ void SPIClass::endTransaction()`
`148`	`149`	`if(_inTransaction){`
`149`	`150`	`_inTransaction = false;`
`150`	`151`	`spiEndTransaction(_spi);`
	`152`	`+ spiUnlock(_spi);`
`151`	`153`	`}`
`152`	`154`	`}`
`153`	`155`