Merge pull request #4579 from geky/rtos-unbreak-semaphore

theotherjimmy · web-flow · commit 77b6127a715c · 2017-06-19T15:32:48.000-05:00
RTOS: Fix semaphore
diff --git a/platform/mbed_retarget.cpp b/platform/mbed_retarget.cpp
@@ -1014,6 +1014,11 @@ extern "C" void EvrRtxMutexError (osMutexId_t mutex_id, int32_t status)
 
 extern "C" void EvrRtxSemaphoreError (osSemaphoreId_t semaphore_id, int32_t status)
 {
+    // Ignore semaphore overflow, the count will saturate with a returned error
+    if (status == osRtxErrorSemaphoreCountLimit) {
+        return;
+    }
+
     error("Semaphore %p error %i\r\n", semaphore_id, status);
 }
 
diff --git a/rtos/Semaphore.cpp b/rtos/Semaphore.cpp
@@ -27,7 +27,7 @@
 namespace rtos {
 
 Semaphore::Semaphore(int32_t count) {
-    constructor(count, 1024);
+    constructor(count, 0xffff);
 }
 
 Semaphore::Semaphore(int32_t count, uint16_t max_count) {

Original file line number	Diff line number	Diff line change
`@@ -1014,6 +1014,11 @@ extern "C" void EvrRtxMutexError (osMutexId_t mutex_id, int32_t status)`
`1014`	`1014`
`1015`	`1015`	`extern "C" void EvrRtxSemaphoreError (osSemaphoreId_t semaphore_id, int32_t status)`
`1016`	`1016`	`{`
	`1017`	`+ // Ignore semaphore overflow, the count will saturate with a returned error`
	`1018`	`+ if (status == osRtxErrorSemaphoreCountLimit) {`
	`1019`	`+ return;`
	`1020`	`+ }`
	`1021`	`+`
`1017`	`1022`	`error("Semaphore %p error %i\r\n", semaphore_id, status);`
`1018`	`1023`	`}`
`1019`	`1024`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`namespace rtos {`
`28`	`28`
`29`	`29`	`Semaphore::Semaphore(int32_t count) {`
`30`		`- constructor(count, 1024);`
	`30`	`+ constructor(count, 0xffff);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`Semaphore::Semaphore(int32_t count, uint16_t max_count) {`