patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

portability: fix thread function signatures

Browse source 
Fix thread function signatures to avoid stack corruption on thread exit.

Signed-off-by: Benedikt Schmidt <benedikt.schmidt@embedded-solutions.at>
This commit is contained in:
Benedikt Schmidt 2023-10-04 10:02:36 +02:00 committed by Carles Cufí
parent d7f0da1c78
commit 24de378986
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subsys/portability/cmsis_rtos_v1/cmsis_thread.c
View file

@ -29,6 +29,8 @@ static inline uint32_t cmsis_to_zephyr_priority(int32_t c_prio)
static void zephyr_thread_wrapper(void *arg1, void *arg2, void *arg3)
{
ARG_UNUSED(arg2);
void * (*fun_ptr)(void *) = arg3;
fun_ptr(arg1);
@ -109,7 +111,7 @@ osThreadId osThreadCreate(const osThreadDef_t *thread_def, void *arg)
tid = k_thread_create(&cm_thread[instance],
stk_ptr[instance], stacksz,
(k_thread_entry_t)zephyr_thread_wrapper,
zephyr_thread_wrapper,
(void *)arg, NULL, thread_def->pthread,
prio, 0, K_NO_WAIT);

2
subsys/portability/cmsis_rtos_v2/thread.c
View file

@ -198,7 +198,7 @@ osThreadId_t osThreadNew(osThreadFunc_t threadfunc, void *arg,
(void)k_thread_create(&tid->z_thread,
stack, stack_size,
(k_thread_entry_t)zephyr_thread_wrapper,
zephyr_thread_wrapper,
(void *)arg, tid, threadfunc,
prio, 0, K_NO_WAIT);