diff options
| author | Sherman <[email protected]> | 2022-01-26 17:48:46 +0800 |
|---|---|---|
| committer | Sherman <[email protected]> | 2022-01-26 17:48:46 +0800 |
| commit | 544c721d89ee7c6e7d3f88dd5bd555a221d8222e (patch) | |
| tree | aafdd34b49eca60159844a6712883cd01fd478b7 /include | |
| parent | fc3c29df709798bcbf0c40e4146e628975c40b9e (diff) | |
| parent | 032ce63ed39c1bbb9f68068c0cf8b876771f27c8 (diff) | |
Merge branch 'master' of github.com:RT-Thread/rt-thread
Diffstat (limited to 'include')
| -rw-r--r-- | include/rtdef.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rtdef.h b/include/rtdef.h index 7f7c2bef04..66d30001a0 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -40,6 +40,7 @@ * 2021-12-21 Meco Man re-implement RT_UNUSED * 2022-01-01 Gabriel improve hooking method * 2022-01-07 Gabriel move some __on_rt_xxxxx_hook to dedicated c soure files + * 2022-01-12 Meco Man remove RT_THREAD_BLOCK */ #ifndef __RT_DEF_H__ @@ -486,6 +487,7 @@ struct rt_object_information #define RT_TIMER_CTRL_SET_ONESHOT 0x2 /**< change timer to one shot */ #define RT_TIMER_CTRL_SET_PERIODIC 0x3 /**< change timer to periodic */ #define RT_TIMER_CTRL_GET_STATE 0x4 /**< get timer run state active or deactive*/ +#define RT_TIMER_CTRL_GET_REMAIN_TIME 0x5 /**< get the remaining hang time */ #ifndef RT_TIMER_SKIP_LIST_LEVEL #define RT_TIMER_SKIP_LIST_LEVEL 1 @@ -545,7 +547,6 @@ typedef siginfo_t rt_siginfo_t; #define RT_THREAD_READY 0x01 /**< Ready status */ #define RT_THREAD_SUSPEND 0x02 /**< Suspend status */ #define RT_THREAD_RUNNING 0x03 /**< Running status */ -#define RT_THREAD_BLOCK RT_THREAD_SUSPEND /**< Blocked status */ #define RT_THREAD_CLOSE 0x04 /**< Closed status */ #define RT_THREAD_STAT_MASK 0x07 @@ -645,7 +646,6 @@ struct rt_thread /* priority */ rt_uint8_t current_priority; /**< current priority */ - rt_uint8_t init_priority; /**< initialized priority */ #if RT_THREAD_PRIORITY_MAX > 32 rt_uint8_t number; rt_uint8_t high_mask; |