diff options
| author | bernard.xiong <[email protected]> | 2010-08-03 08:50:48 +0000 |
|---|---|---|
| committer | bernard.xiong <[email protected]> | 2010-08-03 08:50:48 +0000 |
| commit | 1451735e9edecb2d11576920af36b55e8a539a0d (patch) | |
| tree | 52349dde089a841b5e56e492de18ac85ce03742a /bsp/lpc1114 | |
| parent | 787d7681fdd01beb4531012a3d2746771117b78c (diff) | |
clean up end of line.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@827 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'bsp/lpc1114')
| -rw-r--r-- | bsp/lpc1114/application.c | 14 | ||||
| -rw-r--r-- | bsp/lpc1114/board.c | 66 | ||||
| -rw-r--r-- | bsp/lpc1114/board.h | 10 | ||||
| -rw-r--r-- | bsp/lpc1114/startup.c | 88 |
4 files changed, 89 insertions, 89 deletions
diff --git a/bsp/lpc1114/application.c b/bsp/lpc1114/application.c index 4ef7c37b03..40f1fd4234 100644 --- a/bsp/lpc1114/application.c +++ b/bsp/lpc1114/application.c @@ -5,18 +5,18 @@ * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date Author Notes
- * 2010-01-25 Bernard first version
+ * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2010-01-25 Bernard first version */ /** * @addtogroup LPC1100 */ -/*@{*/
-#include <rtthread.h>
+/*@{*/ +#include <rtthread.h> int rt_application_init() { diff --git a/bsp/lpc1114/board.c b/bsp/lpc1114/board.c index 6ccd875d1a..6ff60a372c 100644 --- a/bsp/lpc1114/board.c +++ b/bsp/lpc1114/board.c @@ -5,21 +5,21 @@ * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date Author Notes
- * 2010-01-25 Bernard first version
+ * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2010-01-25 Bernard first version */ #include <rtthread.h> #include <rthw.h> -#include "board.h"
-#include "uart.h"
-
+#include "board.h" +#include "uart.h" + #include <CMSIS/LPC11xx.h> -#include <CMSIS/core_cm0.h>
+#include <CMSIS/core_cm0.h> /** * @addtogroup LPC1100 @@ -31,35 +31,35 @@ */ void rt_hw_timer_handler() { - /* enter interrupt */
- rt_interrupt_enter();
-
- rt_tick_increase();
-
- /* leave interrupt */
- rt_interrupt_leave();
+ /* enter interrupt */ + rt_interrupt_enter(); + + rt_tick_increase(); + + /* leave interrupt */ + rt_interrupt_leave(); } /** * This function will initial sam7s64 board. */ void rt_hw_board_init() -{
- SystemInit();
-
- /* init systick */
- SysTick_Config(0x0007A11F);
-
- /* set pend exception priority */
- NVIC_SetPriority(PendSV_IRQn, (1<<__NVIC_PRIO_BITS) - 1);
-
-#ifdef RT_USING_UART
- /* init hardware UART device */
- rt_hw_uart_init();
-#endif
-#ifdef RT_USING_CONSOLE
- /* set console device */
- rt_console_set_device("uart");
-#endif
+{ + SystemInit(); + + /* init systick */ + SysTick_Config(0x0007A11F); + + /* set pend exception priority */ + NVIC_SetPriority(PendSV_IRQn, (1<<__NVIC_PRIO_BITS) - 1); + +#ifdef RT_USING_UART + /* init hardware UART device */ + rt_hw_uart_init(); +#endif +#ifdef RT_USING_CONSOLE + /* set console device */ + rt_console_set_device("uart"); +#endif } /*@}*/ diff --git a/bsp/lpc1114/board.h b/bsp/lpc1114/board.h index 1cabc8e886..a8f6dd9f87 100644 --- a/bsp/lpc1114/board.h +++ b/bsp/lpc1114/board.h @@ -5,11 +5,11 @@ * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date Author Notes
- * 2010-01-25 Bernard first version
+ * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2010-01-25 Bernard first version */ #ifndef __BOARD_H__ diff --git a/bsp/lpc1114/startup.c b/bsp/lpc1114/startup.c index d4c5a3fb84..43f55cb3d9 100644 --- a/bsp/lpc1114/startup.c +++ b/bsp/lpc1114/startup.c @@ -5,40 +5,40 @@ * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date Author Notes
- * 2010-01-25 Bernard first version
+ * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2010-01-25 Bernard first version */ #include <rthw.h> #include <rtthread.h> -#include "board.h"
-#ifdef RT_USING_UART
-#include "uart.h"
-#endif
+#include "board.h" +#ifdef RT_USING_UART +#include "uart.h" +#endif /** * @addtogroup sam7s */ /*@{*/ -#ifdef __CC_ARM
-extern int Image$$RW_IRAM1$$ZI$$Limit;
-#endif
-
+#ifdef __CC_ARM +extern int Image$$RW_IRAM1$$ZI$$Limit; +#endif + #ifdef __GNUC__ extern unsigned char __bss_start; extern unsigned char __bss_end; -#endif
+#endif extern void rt_hw_interrupt_init(void); extern int rt_application_init(void); -#ifdef RT_USING_DEVICE
-extern rt_err_t rt_hw_serial_init(void);
-#endif
+#ifdef RT_USING_DEVICE +extern rt_err_t rt_hw_serial_init(void); +#endif /** * This function will startup RT-Thread RTOS. @@ -58,15 +58,15 @@ void rtthread_startup(void) /* init timer system */ rt_system_timer_init(); -#ifdef RT_USING_HEAP
-#ifdef __CC_ARM
- rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)0x204000);
-#elif __ICCARM__
- rt_system_heap_init(__segment_end("HEAP"), (void*)0x204000);
-#else
- rt_system_heap_init((void*)&__bss_end, (void*)0x204000);
-#endif
-#endif
+#ifdef RT_USING_HEAP +#ifdef __CC_ARM + rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)0x204000); +#elif __ICCARM__ + rt_system_heap_init(__segment_end("HEAP"), (void*)0x204000); +#else + rt_system_heap_init((void*)&__bss_end, (void*)0x204000); +#endif +#endif /* init scheduler system */ rt_system_scheduler_init(); @@ -74,12 +74,12 @@ void rtthread_startup(void) #ifdef RT_USING_HOOK /* if the hook is used */ /* set idle thread hook */ rt_thread_idle_sethook(rt_hw_led_flash); -#endif
+#endif -#ifdef RT_USING_DEVICE
- /* init all device */
- rt_device_init_all();
-#endif
+#ifdef RT_USING_DEVICE + /* init all device */ + rt_device_init_all(); +#endif /* init application */ rt_application_init(); @@ -98,19 +98,19 @@ void rtthread_startup(void) /* never reach here */ return ; -}
+} + +int main (void) +{ + rt_uint32_t UNUSED level; + + /* disable interrupt first */ + level = rt_hw_interrupt_disable(); -int main (void)
-{
- rt_uint32_t UNUSED level;
-
- /* disable interrupt first */
- level = rt_hw_interrupt_disable();
-
- /* invoke rtthread_startup */
- rtthread_startup();
-
- return 0;
-}
+ /* invoke rtthread_startup */ + rtthread_startup(); + + return 0; +} /*@}*/ |
