Fix linking error on FreeRTOS when using portYIELD_FROM_ISR

EmbeddedRPC · Mar 5, 2024 · f35233b · f35233b
1 parent 2890823
commit f35233b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/erpc_c/port/erpc_threading_freertos.cpp b/erpc_c/port/erpc_threading_freertos.cpp
@@ -14,6 +14,14 @@
 
 #if ERPC_THREADS_IS(FREERTOS)
 
+// The portYIELD_FROM_ISR() macro declares a variable called
+// ulPortYieldRequired. FreeRTOS assumes ulPortYieldRequired is in the
+// global namespace. To prevent linking errors, portYIELD_FROM_ISR()
+// should not be called from within a namespace.
+inline void ErpcPortYieldFromISR(BaseType_t &higher_priority_task_woken) {
+    portYIELD_FROM_ISR(higher_priority_task_woken);
+}
+
 using namespace erpc;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -248,7 +256,7 @@ void Semaphore::putFromISR(void)
 {
     BaseType_t xHigherPriorityTaskWoken = pdFALSE;
     (void)xSemaphoreGiveFromISR(m_sem, &xHigherPriorityTaskWoken);
-    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+    ErpcPortYieldFromISR(xHigherPriorityTaskWoken);
 }
 
 bool Semaphore::get(uint32_t timeoutUsecs)