ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'neilt6-master'

pull/1764/head
0xc0170 2016-05-23 10:47:30 +01:00
parent 275100e969 327bd41632
commit 821c492eb8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c
View File

@ -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;
}

2
rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c
View File

@ -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;
}