summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author张世争 <[email protected]>2021-02-28 12:00:44 +0800
committer张世争 <[email protected]>2021-02-28 12:00:44 +0800
commit72d7f6c0adf6ef251e7662f09c9dd32579041a19 (patch)
treef33e37cbc2b0443ee3a182a511d012d42354c678
parent2bf53d315d62bd199c01fd2d6a7f05d1a6712153 (diff)
[update][kernel]规范rt_object_t强制转换的使用,消除上次提交的编译警告
-rw-r--r--src/thread.c2
-rw-r--r--src/timer.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/thread.c b/src/thread.c
index 18b5227f5a..beef93f46a 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -358,8 +358,6 @@ RTM_EXPORT(rt_thread_startup);
*/
rt_err_t rt_thread_detach(rt_thread_t thread)
{
- rt_base_t lock;
-
/* thread check */
RT_ASSERT(thread != RT_NULL);
RT_ASSERT(rt_object_get_type((rt_object_t)thread) == RT_Object_Class_Thread);
diff --git a/src/timer.c b/src/timer.c
index 747c28c8bd..2eaca225bc 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -201,7 +201,7 @@ void rt_timer_init(rt_timer_t timer,
RT_ASSERT(timer != RT_NULL);
/* timer object initialization */
- rt_object_init((rt_object_t)timer, RT_Object_Class_Timer, name);
+ rt_object_init(&(timer->parent), RT_Object_Class_Timer, name);
_rt_timer_init(timer, timeout, parameter, time, flag);
}
@@ -298,7 +298,7 @@ rt_err_t rt_timer_delete(rt_timer_t timer)
/* enable interrupt */
rt_hw_interrupt_enable(level);
- rt_object_delete((rt_object_t)timer);
+ rt_object_delete(&(timer->parent));
return RT_EOK;
}