diff options
| author | Meco Jianting Man <[email protected]> | 2021-03-01 07:25:48 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-01 07:25:48 -0600 |
| commit | fab4c5ebb13fd92273de8727c0f18d53716295ff (patch) | |
| tree | b8f309bfe504c942560ea56d90c6f349e80c4c56 /src | |
| parent | 8932ffdb96b793031bbc71bb3bd23202939fcb2c (diff) | |
| parent | 339ebf3c16e4c067f4ddfb7880709a534d41cf53 (diff) | |
Merge pull request #22 from RT-Thread/master
pr
Diffstat (limited to 'src')
| -rw-r--r-- | src/thread.c | 2 | ||||
| -rw-r--r-- | src/timer.c | 4 |
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; } |