diff options
| author | bernard.xiong <[email protected]> | 2010-03-25 15:19:42 +0000 |
|---|---|---|
| committer | bernard.xiong <[email protected]> | 2010-03-25 15:19:42 +0000 |
| commit | e8cc40b3ec6bd7858e3d15349f30eb611b3f8d90 (patch) | |
| tree | ae17144c024b265d8fa8f1e3c39803c710b77d7c /examples/kernel | |
| parent | 474d3b805660b260739702089be2e99a26f6d12b (diff) | |
fix compiling error.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@544 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'examples/kernel')
| -rw-r--r-- | examples/kernel/SConscript | 5 | ||||
| -rw-r--r-- | examples/kernel/timer_control.c | 12 | ||||
| -rw-r--r-- | examples/kernel/timer_dynamic.c | 4 | ||||
| -rw-r--r-- | examples/kernel/timer_static.c | 2 |
4 files changed, 13 insertions, 10 deletions
diff --git a/examples/kernel/SConscript b/examples/kernel/SConscript index e8c73e9942..e0b795443c 100644 --- a/examples/kernel/SConscript +++ b/examples/kernel/SConscript @@ -22,7 +22,10 @@ mutex_simple.c event_simple.c
mbox_simple.c
messageq_simple.c
-timer_simple.c
+timer_static.c
+timer_dynamic.c
+timer_stop_self.c
+timer_control.c
heap_malloc.c
heap_realloc.c
memp_simple.c
diff --git a/examples/kernel/timer_control.c b/examples/kernel/timer_control.c index 7039000dfb..fdee627f58 100644 --- a/examples/kernel/timer_control.c +++ b/examples/kernel/timer_control.c @@ -20,12 +20,12 @@ static void timeout1(void* parameter) if (count >= 8)
{
/* 控制定时器然后更改超时时间长度 */
- rt_timer_control(timer1, RT_TIMER_CTRL_SET_TIME, 50);
+ rt_timer_control(timer1, RT_TIMER_CTRL_SET_TIME, (void*)50);
count = 0;
}
}
-void timer_stop_self_init()
+void timer_control_init()
{
/* 创建定时器1 */
timer1 = rt_timer_create("timer1", /* 定时器名字是 timer1 */
@@ -57,25 +57,25 @@ static void _tc_cleanup() tc_done(TC_STAT_PASSED);
}
-int _tc_timer_stop_self()
+int _tc_timer_control()
{
/* 设置TestCase清理回调函数 */
tc_cleanup(_tc_cleanup);
/* 执行定时器例程 */
count = 0;
- timer_stop_self_init();
+ timer_control_init();
/* 返回TestCase运行的最长时间 */
return 100;
}
/* 输出函数命令到finsh shell中 */
-FINSH_FUNCTION_EXPORT(_tc_timer_stop_self, a dynamic timer example);
+FINSH_FUNCTION_EXPORT(_tc_timer_control, a timer control example);
#else
/* 用户应用入口 */
int rt_application_init()
{
- timer_stop_self_init();
+ timer_control_init();
return 0;
}
diff --git a/examples/kernel/timer_dynamic.c b/examples/kernel/timer_dynamic.c index a4f5ed947f..b28a4c9056 100644 --- a/examples/kernel/timer_dynamic.c +++ b/examples/kernel/timer_dynamic.c @@ -11,13 +11,13 @@ static rt_timer_t timer1; static rt_timer_t timer2;
/* 定时器1超时函数 */
-void timeout1(void* parameter)
+static void timeout1(void* parameter)
{
rt_kprintf("periodic timer is timeout\n");
}
/* 定时器2超时函数 */
-void timeout2(void* parameter)
+static void timeout2(void* parameter)
{
rt_kprintf("one shot timer is timeout\n");
}
diff --git a/examples/kernel/timer_static.c b/examples/kernel/timer_static.c index 9009bf62d9..bddfe63af3 100644 --- a/examples/kernel/timer_static.c +++ b/examples/kernel/timer_static.c @@ -70,7 +70,7 @@ int _tc_timer_static() return 100; } /* 输出函数命令到finsh shell中 */ -FINSH_FUNCTION_EXPORT(_tc_timer_static, a simple timer example); +FINSH_FUNCTION_EXPORT(_tc_timer_static, a static timer example); #else /* 用户应用入口 */ int rt_application_init() |