fix compiling error.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@544 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-03-25 15:19:42 +00:00
parent 474d3b8056
commit e8cc40b3ec
4 changed files with 13 additions and 10 deletions

View File

@ -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

View File

@ -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;
}

View File

@ -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");
}

View File

@ -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()