From 9393c29224a7f5e4e951486e8821a54606a9139f Mon Sep 17 00:00:00 2001 From: "dzzxzz@gmail.com" Date: Mon, 15 Oct 2012 00:51:09 +0000 Subject: [PATCH] fixed coding style in x86 branch git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2351 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/x86/applications/application.c | 183 +++++++++++++++++------------ bsp/x86/applications/startup.c | 80 +++++++------ 2 files changed, 147 insertions(+), 116 deletions(-) diff --git a/bsp/x86/applications/application.c b/bsp/x86/applications/application.c index 48e17cbc1..984d8021c 100644 --- a/bsp/x86/applications/application.c +++ b/bsp/x86/applications/application.c @@ -1,95 +1,124 @@ -/* - * File : application.c +/** File : application.c + * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006, RT-Thread Develop Team + + * COPYRIGHT (C) 2006 - 2012, RT-Thread Develop Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://openlab.rt-thread.com/license/LICENSE + * - * Change Logs: + +* Change Logs: + * Date Author Notes + * 2006-09-15 QiuYi the first version + */ + + /** + * @addtogroup QEMU - */ -/*@{*/ - -#include - -ALIGN(RT_ALIGN_SIZE) -static char thread_led1_stack[1024]; -struct rt_thread thread_led1; -static void rt_thread_entry_led1(void* parameter) -{ - unsigned int count=0; - while (1) - { - /* led1 on */ -#ifndef RT_USING_FINSH - rt_kprintf("led1 on,count : %d\r\n",count); -#endif - count++; - /* sleep 0.5 second and switch to other thread */ - rt_thread_delay(RT_TICK_PER_SECOND/2); - - /* led1 off */ -#ifndef RT_USING_FINSH - rt_kprintf("led1 off\r\n"); -#endif - rt_thread_delay(RT_TICK_PER_SECOND/2); - } -} - -ALIGN(RT_ALIGN_SIZE) -static char thread_led2_stack[1024]; -struct rt_thread thread_led2; -void rt_thread_entry_led2(void* parameter) -{ - unsigned int count=0; - while (1) - { - /* led2 on */ -#ifndef RT_USING_FINSH - rt_kprintf("led2 on,count : %d\r\n",count); -#endif - count++; - rt_thread_delay(RT_TICK_PER_SECOND); - - /* led2 off */ -#ifndef RT_USING_FINSH - rt_kprintf("led2 off\r\n"); -#endif - rt_thread_delay(RT_TICK_PER_SECOND); - } -} -/** - * This function will be invoked to initalize user application when system startup. */ -int rt_application_init() + + +/*@{*/ + + +#include + +ALIGN(RT_ALIGN_SIZE) +static char thread_led1_stack[1024]; +struct rt_thread thread_led1; +static void rt_thread_entry_led1(void *parameter) { - //------- init led1 thread - rt_thread_init(&thread_led1, - "led1", - rt_thread_entry_led1, - RT_NULL, - &thread_led1_stack[0], - sizeof(thread_led1_stack),11,5); - rt_thread_startup(&thread_led1); - - //------- init led2 thread - rt_thread_init(&thread_led2, - "led2", - rt_thread_entry_led2, - RT_NULL, - &thread_led2_stack[0], - sizeof(thread_led2_stack),12,5); - rt_thread_startup(&thread_led2); - - return 0; /* empty */ + unsigned int count=0; + + while (1) + { + /* led1 on */ +#ifndef RT_USING_FINSH + rt_kprintf("led1 on,count : %d\r\n",count); +#endif + count ++; + /* sleep 0.5 second and switch to other thread */ + rt_thread_delay(RT_TICK_PER_SECOND / 2); + + /* led1 off */ +#ifndef RT_USING_FINSH + rt_kprintf("led1 off\r\n"); +#endif + rt_thread_delay(RT_TICK_PER_SECOND / 2); + } } +ALIGN(RT_ALIGN_SIZE) +static char thread_led2_stack[1024]; +struct rt_thread thread_led2; +void rt_thread_entry_led2(void *parameter) +{ + unsigned int count=0; + + while (1) + { + /* led2 on */ +#ifndef RT_USING_FINSH + rt_kprintf("led2 on,count : %d\r\n",count); +#endif + count ++; + rt_thread_delay(RT_TICK_PER_SECOND); + + /* led2 off */ +#ifndef RT_USING_FINSH + rt_kprintf("led2 off\r\n"); +#endif + rt_thread_delay(RT_TICK_PER_SECOND); + } +} + +/** + + * This function will be invoked to initalize user application when system + * startup. + + */ + +int rt_application_init(void) + +{ + + // init led1 thread + rt_thread_init(&thread_led1, + "led1", + rt_thread_entry_led1, + RT_NULL, + &thread_led1_stack[0], + sizeof(thread_led1_stack),11,5); + rt_thread_startup(&thread_led1); + + // init led2 thread + rt_thread_init(&thread_led2, + "led2", + rt_thread_entry_led2, + RT_NULL, + &thread_led2_stack[0], + sizeof(thread_led2_stack),12,5); + rt_thread_startup(&thread_led2); + + return 0; + +} + + + /*@}*/ + diff --git a/bsp/x86/applications/startup.c b/bsp/x86/applications/startup.c index c4e50087a..e91b3e6d9 100644 --- a/bsp/x86/applications/startup.c +++ b/bsp/x86/applications/startup.c @@ -1,7 +1,7 @@ /* * File : startup.c * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006, RT-Thread Develop Team + * COPYRIGHT (C) 2006 - 2012, RT-Thread Develop Team * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -28,7 +28,7 @@ extern int rt_application_init(void); #ifdef RT_USING_FINSH extern void finsh_system_init(void); -extern void finsh_set_device(const char* device); +extern void finsh_set_device(const char *device); #endif extern unsigned char __bss_start[]; @@ -37,71 +37,73 @@ extern unsigned char __bss_end[]; /** * @addtogroup QEMU */ + /*@{*/ /* clear .bss */ -void rt_hw_clear_bss() +void rt_hw_clear_bss(void) { - unsigned char *dst; - dst = __bss_start; - while(dst < __bss_end) *dst++ = 0; + unsigned char *dst; + dst = __bss_start; + while (dst < __bss_end) + *dst++ = 0; } /** * This function will startup RT-Thread RTOS */ -void rtthread_startup() +void rtthread_startup(void) { - /* clear .bss */ - rt_hw_clear_bss(); + /* clear .bss */ + rt_hw_clear_bss(); - /* init hardware interrupt */ - rt_hw_interrupt_init(); + /* init hardware interrupt */ + rt_hw_interrupt_init(); - /* init the console */ - rt_hw_console_init(); - rt_console_set_device("console"); + /* init the console */ + rt_hw_console_init(); + rt_console_set_device("console"); - /* init board */ - rt_hw_board_init(); + /* init board */ + rt_hw_board_init(); - rt_show_version(); + rt_show_version(); - /* init tick */ - rt_system_tick_init(); + /* init tick */ + rt_system_tick_init(); - /* init kernel object */ - rt_system_object_init(); + /* init kernel object */ + rt_system_object_init(); - /* init timer system */ - rt_system_timer_init(); + /* init timer system */ + rt_system_timer_init(); - /* init memory system */ + /* init memory system */ #ifdef RT_USING_HEAP - rt_system_heap_init((void*)&__bss_end, (void*)(1024UL*1024*8)); /* RAM 16M */ + /* RAM 16M */ + rt_system_heap_init((void *)&__bss_end, (void *)(1024UL*1024*8)); #endif - /* init scheduler system */ - rt_system_scheduler_init(); + /* init scheduler system */ + rt_system_scheduler_init(); - /* init application */ - rt_application_init(); + /* init application */ + rt_application_init(); #ifdef RT_USING_FINSH - /* init finsh */ - finsh_system_init(); - finsh_set_device("console"); + /* init finsh */ + finsh_system_init(); + finsh_set_device("console"); #endif - /* init idle thread */ - rt_thread_idle_init(); + /* init idle thread */ + rt_thread_idle_init(); - /* start scheduler */ - rt_system_scheduler_start(); - - /* never reach here */ - return ; + /* start scheduler */ + rt_system_scheduler_start(); + /* never reach here */ + return ; } /*@}*/