From a2bfca7527f42176afb13e5ca0ac8edfbf417c09 Mon Sep 17 00:00:00 2001 From: neilt6 Date: Wed, 11 May 2016 16:06:24 -0600 Subject: [PATCH] [RTOS] Fixed osThreadGetState() Fixed regression that caused terminated threads to return an erroneous state value instead of "inactive". --- libraries/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c | 2 +- libraries/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c b/libraries/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c index 5a132250a6..97218d0fec 100644 --- a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c +++ b/libraries/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c @@ -905,7 +905,7 @@ uint8_t osThreadGetState (osThreadId thread_id) { if (__exceptional_mode()) return osErrorISR; // Not allowed in ISR ptcb = rt_tid2ptcb(thread_id); // Get TCB pointer - if (ptcb == NULL) return osErrorParameter; + if (ptcb == NULL) return INACTIVE; return ptcb->state; } diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c b/libraries/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c index 5e33684bce..98efed089a 100644 --- a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c +++ b/libraries/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c @@ -842,7 +842,7 @@ uint8_t osThreadGetState (osThreadId thread_id) { if (__get_IPSR() != 0U) return osErrorISR; // Not allowed in ISR ptcb = rt_tid2ptcb(thread_id); // Get TCB pointer - if (ptcb == NULL) return osErrorParameter; + if (ptcb == NULL) return INACTIVE; return ptcb->state; }