Fix CoreMutex FreeRTOS ISR logic (earlephilhower#1510)

earlephilhower · web-flow · commit 5204dab99b38 · 2023-06-07T00:15:41.000-07:00
diff --git a/cores/rp2040/CoreMutex.cpp b/cores/rp2040/CoreMutex.cpp
@@ -30,10 +30,15 @@ CoreMutex::CoreMutex(mutex_t *mutex, uint8_t option) {
     _option = option;
     if (__isFreeRTOS) {
         auto m = __get_freertos_mutex_for_ptr(mutex);
-        if (__freertos_check_if_in_isr() && !__freertos_mutex_take_from_isr(m)) {
-            return;
+        if (__freertos_check_if_in_isr()) {
+            if (!__freertos_mutex_take_from_isr(m)) {
+                return;
+            }
+            // At this point we have the mutex in ISR
+        } else {
+            // Grab the mutex normally, possibly waking other tasks to get it
+            __freertos_mutex_take(m);
         }
-        __freertos_mutex_take(m);
     } else {
         uint32_t owner;
         if (!mutex_try_enter(_mutex, &owner)) {
