Skip to content

Commit ed13c25

Browse files
committed
Merge branch '25-os_flagtaskrdy-timeoutsuspend' into develop
2 parents 324adb0 + a66cfc6 commit ed13c25

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Source/os_flag.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,11 @@ void OS_FlagTaskRdy (OS_TCB *p_tcb,
12841284

12851285
case OS_TASK_STATE_PEND_SUSPENDED:
12861286
case OS_TASK_STATE_PEND_TIMEOUT_SUSPENDED:
1287+
#if (OS_CFG_TICK_EN > 0u)
1288+
if (p_tcb->TaskState == OS_TASK_STATE_PEND_TIMEOUT_SUSPENDED) {
1289+
OS_TickListRemove(p_tcb); /* Remove from tick list */
1290+
}
1291+
#endif
12871292
p_tcb->TaskState = OS_TASK_STATE_SUSPENDED;
12881293
break;
12891294

0 commit comments

Comments
 (0)