From 565cd29e940441ac577d774accc32b99b7e858d7 Mon Sep 17 00:00:00 2001 From: mculover666 <2412828003@qq.com> Date: Wed, 23 Mar 2022 18:22:19 +0800 Subject: [PATCH] fix the bug in task suspend --- kernel/core/include/tos_version.h | 6 +++--- kernel/core/tos_task.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/core/include/tos_version.h b/kernel/core/include/tos_version.h index 2b7d353a..590b1d44 100644 --- a/kernel/core/include/tos_version.h +++ b/kernel/core/include/tos_version.h @@ -24,9 +24,9 @@ // patch is updated for patch changes/bug fixes that should not need user code changes #define TOS_VERSION_MAJOR 0x02 -#define TOS_VERSION_MINOR 0x04 -#define TOS_VERSION_PATCH 0x05 -#define TOS_VERSION "2.4.5" +#define TOS_VERSION_MINOR 0x05 +#define TOS_VERSION_PATCH 0x00 +#define TOS_VERSION "2.5.0" #endif /* _TOS_VERSION_H_ */ diff --git a/kernel/core/tos_task.c b/kernel/core/tos_task.c index 496de2c2..a19652c6 100644 --- a/kernel/core/tos_task.c +++ b/kernel/core/tos_task.c @@ -424,6 +424,12 @@ __API__ k_err_t tos_task_suspend(k_task_t *task) if (task_state_is_ready(task)) { // kill the good kid readyqueue_remove(task); } + if (task_state_is_pending(task)) { + pend_list_remove(task); + } + if (task_state_is_sleeping(task)) { + tick_list_remove(task); + } task_state_set_suspended(task); TOS_CPU_INT_ENABLE();