diff options
| author | Bernard Xiong <[email protected]> | 2018-07-12 14:09:39 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2018-07-12 14:09:39 +0800 |
| commit | 5c420c0c6e23de57ba2f308ec3c99b8da19c8311 (patch) | |
| tree | 061a3e5bebe25de8152a878f35709ec40d8bea9d /src/timer.c | |
| parent | 41f2f1829f3227b2d405feb75751ac5debfcc1e8 (diff) | |
| parent | 44712ba2cfd113374986f7a63d7c48ec34c4a8da (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'src/timer.c')
| -rw-r--r-- | src/timer.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/timer.c b/src/timer.c index d6cf486931..8354d43a43 100644 --- a/src/timer.c +++ b/src/timer.c @@ -207,6 +207,8 @@ rt_err_t rt_timer_detach(rt_timer_t timer) /* timer check */ RT_ASSERT(timer != RT_NULL); + RT_ASSERT(rt_object_get_type(&timer->parent) == RT_Object_Class_Timer); + RT_ASSERT(rt_object_is_systemobject(&timer->parent)); /* disable interrupt */ level = rt_hw_interrupt_disable(); @@ -268,6 +270,8 @@ rt_err_t rt_timer_delete(rt_timer_t timer) /* timer check */ RT_ASSERT(timer != RT_NULL); + RT_ASSERT(rt_object_get_type(&timer->parent) == RT_Object_Class_Timer); + RT_ASSERT(rt_object_is_systemobject(&timer->parent) == RT_FALSE); /* disable interrupt */ level = rt_hw_interrupt_disable(); @@ -302,6 +306,7 @@ rt_err_t rt_timer_start(rt_timer_t timer) /* timer check */ RT_ASSERT(timer != RT_NULL); + RT_ASSERT(rt_object_get_type(&timer->parent) == RT_Object_Class_Timer); /* stop timer firstly */ level = rt_hw_interrupt_disable(); @@ -422,6 +427,8 @@ rt_err_t rt_timer_stop(rt_timer_t timer) /* timer check */ RT_ASSERT(timer != RT_NULL); + RT_ASSERT(rt_object_get_type(&timer->parent) == RT_Object_Class_Timer); + if (!(timer->parent.flag & RT_TIMER_FLAG_ACTIVATED)) return -RT_ERROR; @@ -455,6 +462,7 @@ rt_err_t rt_timer_control(rt_timer_t timer, int cmd, void *arg) { /* timer check */ RT_ASSERT(timer != RT_NULL); + RT_ASSERT(rt_object_get_type(&timer->parent) == RT_Object_Class_Timer); switch (cmd) { |