Merge pull request #2297 from neilt6/spi-mutex-fix

0xc0170 · web-flow · commit ac34f29f6647 · 2016-07-29T17:30:38.000+02:00
[HAL] Modified SPI to use shared mutex
diff --git a/hal/api/SPI.h b/hal/api/SPI.h
@@ -22,6 +22,7 @@
 
 #include "PlatformMutex.h"
 #include "spi_api.h"
+#include "SingletonPtr.h"
 
 #if DEVICE_SPI_ASYNCH
 #include "CThunk.h"
@@ -247,7 +248,7 @@ class SPI {
 
     void aquire(void);
     static SPI *_owner;
-    PlatformMutex _mutex;
+    static SingletonPtr<PlatformMutex> _mutex;
     int _bits;
     int _mode;
     int _hz;
diff --git a/hal/common/SPI.cpp b/hal/common/SPI.cpp
@@ -57,6 +57,7 @@ void SPI::frequency(int hz) {
 }
 
 SPI* SPI::_owner = NULL;
+SingletonPtr<PlatformMutex> SPI::_mutex;
 
 // ignore the fact there are multiple physical spis, and always update if it wasnt us last
 void SPI::aquire() {
@@ -78,11 +79,11 @@ int SPI::write(int value) {
 }
 
 void SPI::lock() {
-    _mutex.lock();
+    _mutex->lock();
 }
 
 void SPI::unlock() {
-    _mutex.unlock();
+    _mutex->unlock();
 }
 
 #if DEVICE_SPI_ASYNCH

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ void SPI::frequency(int hz) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`SPI* SPI::_owner = NULL;`
	`60`	`+SingletonPtr<PlatformMutex> SPI::_mutex;`
`60`	`61`
`61`	`62`	`// ignore the fact there are multiple physical spis, and always update if it wasnt us last`
`62`	`63`	`void SPI::aquire() {`
`@@ -78,11 +79,11 @@ int SPI::write(int value) {`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`void SPI::lock() {`
`81`		`- _mutex.lock();`
	`82`	`+ _mutex->lock();`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`void SPI::unlock() {`
`85`		`- _mutex.unlock();`
	`86`	`+ _mutex->unlock();`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`#if DEVICE_SPI_ASYNCH`