Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix linking error on FreeRTOS when using portYIELD_FROM_ISR #413

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix linking error on FreeRTOS when using portYIELD_FROM_ISR #413

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fc7a47
Fix linking error on FreeRTOS when using portYIELD_FROM_ISR
Thom747 Mar 5, 2024
126feb6
Merge branch 'develop' into fix-freertos-port
Thom747 Mar 19, 2024
ae78984
Merge branch 'develop' into fix-freertos-port
Thom747 Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion erpc_c/port/erpc_threading_freertos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@

#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;

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -248,7 +257,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)
Expand Down