Merge pull request #420 from openweave/issue/nordic-freertos-assert

Fix for issue #419 : nRF52: Crash in FreeRTOS when configASSERT defined

Author: Jay Logue

src/adaptations/device-layer/nRF5/nRF5Config.cpp

@@ -716,19 +716,24 @@ void NRF5Config::HandleFDSEvent(const fds_evt_t * fdsEvent)
 
     // Signal the Weave thread that the operation has completed.
 #if defined(SOFTDEVICE_PRESENT) && SOFTDEVICE_PRESENT
-    if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED)
-    {
-        BaseType_t yieldRequired = xSemaphoreGiveFromISR(sAsyncOpCompletionSem, &yieldRequired);
-        if (yieldRequired == pdTRUE)
-        {
-            portYIELD_FROM_ISR(yieldRequired);
-        }
-    }
-    else
-#endif // defined(SOFTDEVICE_PRESENT) || !SOFTDEVICE_PRESENT
+
+    // When using the Nodic SoftDevice, HandleFDSEvent() is called in a SoftDevice interrupt
+    // context.  Therefore, we must use xSemaphoreGiveFromISR() to signal completion.
+    BaseType_t yieldRequired = xSemaphoreGiveFromISR(sAsyncOpCompletionSem, &yieldRequired);
+
+    // Yield to the next runnable task, but only if the FreeRTOS scheduler has been started.
+    if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED && yieldRequired == pdTRUE)
     {
-        xSemaphoreGive(sAsyncOpCompletionSem);
+        portYIELD_FROM_ISR(yieldRequired);
     }
+
+#else // defined(SOFTDEVICE_PRESENT) || !SOFTDEVICE_PRESENT
+
+    // When NOT using the Nodic SoftDevice, HandleFDSEvent() is called in a non-interrupt
+    // context. Therefore, use xSemaphoreGive() to signal completion.
+    xSemaphoreGive(sAsyncOpCompletionSem);
+
+#endif // !(defined(SOFTDEVICE_PRESENT) || !SOFTDEVICE_PRESENT)
 }
 
 void NRF5Config::RunConfigUnitTest()