diff options
| author | guo <[email protected]> | 2021-12-02 10:09:37 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-02 10:09:37 +0800 |
| commit | fda37d55f8363d97dfc31c8e86b014c04cda2c10 (patch) | |
| tree | 66742824f17fc0f221732fde4d1a15402b7a8554 /src/timer.c | |
| parent | 1d4594c6fcad494ef256c9bbd8aa7d64132a0995 (diff) | |
| parent | 1cf8370b1ba5eca639e4b976f1e878753ee41548 (diff) | |
Merge pull request #5319 from RT-Thread/master
【PSE分支】同步master到PSE分支
Diffstat (limited to 'src/timer.c')
| -rw-r--r-- | src/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/timer.c b/src/timer.c index 25ba175306..846c33263b 100644 --- a/src/timer.c +++ b/src/timer.c @@ -560,12 +560,12 @@ rt_err_t rt_timer_control(rt_timer_t timer, int cmd, void *arg) if(timer->parent.flag & RT_TIMER_FLAG_ACTIVATED) { /*timer is start and run*/ - *(rt_tick_t *)arg = RT_TIMER_FLAG_ACTIVATED; + *(rt_uint32_t *)arg = RT_TIMER_FLAG_ACTIVATED; } else { /*timer is stop*/ - *(rt_tick_t *)arg = RT_TIMER_FLAG_DEACTIVATED; + *(rt_uint32_t *)arg = RT_TIMER_FLAG_DEACTIVATED; } break; |