diff --git a/bsp/lpc178x/applications/application.c b/bsp/lpc178x/applications/application.c index d7e2cfe9a660796b986365634210a147009d7dfe..29352f857b8bf54446586077264eb7fafb7b7283 100644 --- a/bsp/lpc178x/applications/application.c +++ b/bsp/lpc178x/applications/application.c @@ -35,6 +35,11 @@ #include #endif +#ifdef RT_USING_FINSH +#include +#include +#endif + /* thread phase init */ void rt_init_thread_entry(void *parameter) { @@ -97,6 +102,11 @@ void rt_init_thread_entry(void *parameter) } } #endif + +#ifdef RT_USING_FINSH + /* initialize finsh */ + finsh_system_init(); +#endif } // init led diff --git a/bsp/lpc178x/applications/startup.c b/bsp/lpc178x/applications/startup.c index 989b74f924acc5409eb12aa67efd86466d9480c0..4da4991523405ecb5ed3fa2157a350f75bd088a9 100644 --- a/bsp/lpc178x/applications/startup.c +++ b/bsp/lpc178x/applications/startup.c @@ -20,10 +20,6 @@ #include "board.h" extern int rt_application_init(void); -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -extern void finsh_set_device(const char* device); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; @@ -81,12 +77,6 @@ void rtthread_startup(void) /* initialize application */ rt_application_init(); -#ifdef RT_USING_FINSH - /* initialize finsh */ - finsh_system_init(); - finsh_set_device( FINSH_DEVICE_NAME ); -#endif - /* initialize timer */ rt_system_timer_init(); diff --git a/bsp/lpc2148/applications/application.c b/bsp/lpc2148/applications/application.c index f1c8d330655236b101934bdc586b3b864fec3eea..5ceb37183794db1a010317b136de7f36e089d66f 100644 --- a/bsp/lpc2148/applications/application.c +++ b/bsp/lpc2148/applications/application.c @@ -19,6 +19,11 @@ */ /*@{*/ +#ifdef RT_USING_FINSH +#include +#include +#endif + #ifdef RT_USING_DFS /* dfs init */ #include @@ -41,16 +46,31 @@ /* thread phase init */ void rt_init_thread_entry(void *parameter) { +#ifdef RT_USING_DEVICE +#ifdef RT_USING_DFS + /* init sd card */ + rt_hw_sdcard_init(); +#endif + +#ifdef RT_USING_LWIP + eth_system_device_init(); + /* init ethernetif device */ + rt_hw_dm9000_init(); +#endif + + /* init hardware serial device */ + rt_hw_serial_init(); +#endif + /* Filesystem Initialization */ #ifdef RT_USING_DFS { /* init the device filesystem */ dfs_init(); - /* init the efsl filesystam*/ - efsl_init(); + elm_init(); /* mount sd card fat partition 1 as root directory */ - if (dfs_mount("sd0", "/", "efs", 0, 0) == 0) + if (dfs_mount("sd0", "/", "elm", 0, 0) == 0) rt_kprintf("File System initialized!\n"); else rt_kprintf("File System init failed!\n"); @@ -67,6 +87,10 @@ void rt_init_thread_entry(void *parameter) rt_kprintf("TCP/IP initialized!\n"); } #endif + +#ifdef RT_USING_FINSH + finsh_system_init(); +#endif } /************** LED BLINK *******************/ @@ -78,53 +102,53 @@ void rt_init_thread_entry(void *parameter) ALIGN(4) char thread_led1_stack[512]; struct rt_thread thread_led1; -void thread_led1_entry(void* parameter) +void thread_led1_entry(void *parameter) { - unsigned int count=0; + unsigned int count = 0; IO1DIR |= LED1; - while(1) + while (1) { /* led1 on */ IO1CLR = LED1; #ifndef RT_USING_FINSH - rt_kprintf("led1 on, count : %d\r\n",count); + rt_kprintf("led1 on, count : %d\r\n", count); #endif count++; - rt_thread_delay( RT_TICK_PER_SECOND/3 ); /* delay 0.3s */ + rt_thread_delay(RT_TICK_PER_SECOND / 3); /* delay 0.3s */ /* led1 off */ IO1SET = LED1; #ifndef RT_USING_FINSH rt_kprintf("led1 off\r\n"); #endif - rt_thread_delay( RT_TICK_PER_SECOND/3 ); + rt_thread_delay(RT_TICK_PER_SECOND / 3); } } ALIGN(4) char thread_led2_stack[512]; struct rt_thread thread_led2; -void thread_led2_entry(void* parameter) +void thread_led2_entry(void *parameter) { - unsigned int count=0; + unsigned int count = 0; IO1DIR |= LED2; - while(1) + while (1) { /* led2 on */ IO1CLR = LED2; #ifndef RT_USING_FINSH - rt_kprintf("led2 on, count : %d\r\n",count); + rt_kprintf("led2 on, count : %d\r\n", count); #endif count++; - rt_thread_delay( RT_TICK_PER_SECOND/2 ); /* delay 0.5s */ + rt_thread_delay(RT_TICK_PER_SECOND / 2); /* delay 0.5s */ /* led2 off */ IO1SET = LED2; #ifndef RT_USING_FINSH rt_kprintf("led1 off\r\n"); #endif - rt_thread_delay( RT_TICK_PER_SECOND/2 ); + rt_thread_delay(RT_TICK_PER_SECOND / 2); } } /************** LED BLINK *******************/ diff --git a/bsp/lpc2148/applications/startup.c b/bsp/lpc2148/applications/startup.c index e9a79678191c7c670fd327b7eaf233888276021d..4a2db19c95a512d0c8dc9a1855a8b744c194ae52 100644 --- a/bsp/lpc2148/applications/startup.c +++ b/bsp/lpc2148/applications/startup.c @@ -33,18 +33,11 @@ /*@{*/ -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -#endif - extern int rt_application_init(void); extern void rt_show_version(void); #ifdef RT_USING_DEVICE extern rt_err_t rt_hw_serial_init(void); #endif -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; @@ -76,41 +69,19 @@ void rtthread_startup(void) #ifdef RT_USING_HEAP #ifdef __CC_ARM - rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)0x40008000); + rt_system_heap_init((void *)&Image$$RW_IRAM1$$ZI$$Limit, (void *)0x40008000); #else /* init memory system */ - rt_system_heap_init((void*)&__bss_end, (void*)0x40008000); + rt_system_heap_init((void *)&__bss_end, (void *)0x40008000); #endif #endif /* init scheduler system */ rt_system_scheduler_init(); -#ifdef RT_USING_DEVICE -#ifdef RT_USING_DFS - /* init sd card */ - rt_hw_sdcard_init(); -#endif - -#ifdef RT_USING_LWIP - eth_system_device_init(); - /* init ethernetif device */ - rt_hw_dm9000_init(); -#endif - - /* init hardware serial device */ - rt_hw_serial_init(); -#endif - /* init application */ rt_application_init(); -#ifdef RT_USING_FINSH - /* init finsh */ - finsh_system_init(); - finsh_set_device("uart1"); -#endif - /* init idle thread */ rt_thread_idle_init(); @@ -121,7 +92,7 @@ void rtthread_startup(void) return ; } -int main (void) +int main(void) { /* invoke rtthread_startup */ rtthread_startup(); diff --git a/bsp/lpc2478/applications/application.c b/bsp/lpc2478/applications/application.c index 1f92fc7b8c46f1fb3503f30f7752ac9b538aa432..ea8d1d68a1f1a8771bbb5ac1243dc37207fe6f92 100644 --- a/bsp/lpc2478/applications/application.c +++ b/bsp/lpc2478/applications/application.c @@ -14,13 +14,23 @@ #include +#ifdef RT_USING_FINSH +#include +#include +#endif + /** * @addtogroup LPC2478 */ /*@{*/ int rt_application_init() { - return 0; +#ifdef RT_USING_FINSH + /* init finsh */ + finsh_system_init(); +#endif + + return 0; } /*@}*/ diff --git a/bsp/lpc2478/applications/startup.c b/bsp/lpc2478/applications/startup.c index 33fc5c99336c820154457af4cd4d0d65bdfbc359..c262e57149e01a1812827f5eaf74456129bbb412 100644 --- a/bsp/lpc2478/applications/startup.c +++ b/bsp/lpc2478/applications/startup.c @@ -10,19 +10,13 @@ * Change Logs: * Date Author Notes * 2008-12-11 xuxinming first version - * 2010-4-3 LiJin add init soft timer thread + * 2010-4-3 LiJin add init soft timer thread */ #include #include -#ifdef RT_USING_FINSH -#include -extern int finsh_system_init(void); -#endif - #include -#include /** * @addtogroup LPC2478 @@ -30,9 +24,6 @@ extern int finsh_system_init(void); /*@{*/ extern int rt_application_init(void); -#ifdef RT_USING_DEVICE -extern rt_err_t rt_hw_serial_init(void); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; @@ -45,67 +36,61 @@ extern int __bss_end; */ void rtthread_startup(void) { - /* init hardware interrupt */ - rt_hw_interrupt_init(); - - /* init board */ - rt_hw_board_init(); - - /* init tick */ - rt_system_tick_init(); - - /* init kernel object */ - rt_system_object_init(); - - rt_show_version(); - - /* init timer system */ - rt_system_timer_init(); - - /* init memory system */ + /* init hardware interrupt */ + rt_hw_interrupt_init(); + + /* init board */ + rt_hw_board_init(); + + /* init tick */ + rt_system_tick_init(); + + /* init kernel object */ + rt_system_object_init(); + + rt_show_version(); + + /* init timer system */ + rt_system_timer_init(); + + /* init memory system */ #ifdef RT_USING_HEAP #ifdef __CC_ARM - rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)0x40010000); + rt_system_heap_init((void *)&Image$$RW_IRAM1$$ZI$$Limit, (void *)0x40010000); #else - rt_system_heap_init((void*)&__bss_end, (void*)0x40010000); + rt_system_heap_init((void *)&__bss_end, (void *)0x40010000); #endif #endif - /* init scheduler system */ - rt_system_scheduler_init(); + /* init scheduler system */ + rt_system_scheduler_init(); - /* init application */ - rt_application_init(); - -#ifdef RT_USING_FINSH - /* init finsh */ - finsh_system_init(); - finsh_set_device("uart1"); -#endif - - /* init soft timer thread */ - rt_system_timer_thread_init(); - - /* init idle thread */ - rt_thread_idle_init(); - - /* start scheduler */ - rt_system_scheduler_start(); - - /* never reach here */ - return ; + /* init application */ + rt_application_init(); + + /* init soft timer thread */ + rt_system_timer_thread_init(); + + /* init idle thread */ + rt_thread_idle_init(); + + /* start scheduler */ + rt_system_scheduler_start(); + + /* never reach here */ + return ; } #ifdef __CC_ARM int main(void) { - /* disable interrupt first */ - rt_hw_interrupt_disable(); + /* disable interrupt first */ + rt_hw_interrupt_disable(); + + /* invoke rtthread_startup */ + rtthread_startup(); - /* invoke rtthread_startup */ - rtthread_startup(); - - return 0; + return 0; } #endif diff --git a/bsp/lpc5410x/applications/application.c b/bsp/lpc5410x/applications/application.c index 87ae876e548858d19053f6543311d87e9a1fe089..627e97c860273f3052abb347c14cf22d6e6e2178 100644 --- a/bsp/lpc5410x/applications/application.c +++ b/bsp/lpc5410x/applications/application.c @@ -18,16 +18,16 @@ #include #endif - extern int demo_init(void); void rt_init_thread_entry(void* parameter) { +#ifdef RT_USING_FINSH /* initialization finsh shell Component */ finsh_system_init(); +#endif demo_init(); - } int rt_application_init() diff --git a/bsp/lpc5410x/applications/startup.c b/bsp/lpc5410x/applications/startup.c index 90829ebc398cfbfaf4fb444f6ecc96b2aa5614aa..4008c3dcdebf6e439f4a6ef04d2d0be036f13870 100644 --- a/bsp/lpc5410x/applications/startup.c +++ b/bsp/lpc5410x/applications/startup.c @@ -5,7 +5,7 @@ * * 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 + * http://www.rt-thread.org/license/LICENSE * * Change Logs: * Date Author Notes diff --git a/bsp/stm32f0x/applications/startup.c b/bsp/stm32f0x/applications/startup.c index db65b664f1737732d0d2853542343db72466cba7..4d9bfaa68917b565819fd722db464623a508ebb3 100644 --- a/bsp/stm32f0x/applications/startup.c +++ b/bsp/stm32f0x/applications/startup.c @@ -25,10 +25,6 @@ /*@{*/ extern int rt_application_init(void); -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -extern void finsh_set_device(const char* device); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; diff --git a/bsp/stm32f20x/applications/application.c b/bsp/stm32f20x/applications/application.c index c49a229b089c7911b12040b4bdb182c0abf70ed3..18019e76685ea81263499b87ddb92b51c23e310a 100644 --- a/bsp/stm32f20x/applications/application.c +++ b/bsp/stm32f20x/applications/application.c @@ -20,6 +20,11 @@ #include #include +#ifdef RT_USING_FINSH +#include +#include +#endif + #ifdef RT_USING_DFS /* dfs init */ #include @@ -41,6 +46,14 @@ void rt_init_thread_entry(void* parameter) /* Filesystem Initialization */ #ifdef RT_USING_DFS { + + /* init sdcard driver */ +#if STM32_USE_SDIO + rt_hw_sdcard_init(); +#else + rt_hw_msd_init(); +#endif + /* init the device filesystem */ dfs_init(); @@ -75,6 +88,13 @@ void rt_init_thread_entry(void* parameter) rt_kprintf("TCP/IP initialized!\n"); } #endif + + rt_hw_rtc_init(); + +#ifdef RT_USING_FINSH + /* init finsh */ + finsh_system_init(); +#endif } int rt_application_init() diff --git a/bsp/stm32f20x/applications/startup.c b/bsp/stm32f20x/applications/startup.c index 476ff31ed2eb1814644436977355238908f642ed..71f4440507f87253a4279856407b49f91c6ae07a 100644 --- a/bsp/stm32f20x/applications/startup.c +++ b/bsp/stm32f20x/applications/startup.c @@ -25,10 +25,6 @@ /*@{*/ extern int rt_application_init(void); -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -extern void finsh_set_device(const char* device); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; @@ -96,26 +92,9 @@ void rtthread_startup(void) /* init scheduler system */ rt_system_scheduler_init(); -#ifdef RT_USING_DFS - /* init sdcard driver */ -#if STM32_USE_SDIO - rt_hw_sdcard_init(); -#else - rt_hw_msd_init(); -#endif -#endif - - rt_hw_rtc_init(); - /* init application */ rt_application_init(); -#ifdef RT_USING_FINSH - /* init finsh */ - finsh_system_init(); - finsh_set_device("uart1"); -#endif - /* init timer thread */ rt_system_timer_thread_init(); diff --git a/bsp/stm32f40x/applications/application.c b/bsp/stm32f40x/applications/application.c index bfa3428eca0d6d3ca24ee40719d08f68b3328b9f..f1d1f68438d1dd00a801740323e9b0150b25073d 100644 --- a/bsp/stm32f40x/applications/application.c +++ b/bsp/stm32f40x/applications/application.c @@ -23,6 +23,11 @@ #include "stm32f4xx_eth.h" #endif +#ifdef RT_USING_FINSH +#include +#include +#endif + #ifdef RT_USING_GDB #include #endif @@ -50,6 +55,11 @@ void rt_init_thread_entry(void* parameter) rt_kprintf("TCP/IP initialized!\n"); } #endif + +#ifdef RT_USING_FINSH + /* init finsh */ + finsh_system_init(); +#endif } int rt_application_init() @@ -65,5 +75,3 @@ int rt_application_init() return 0; } - -/*@}*/ diff --git a/bsp/stm32f40x/applications/startup.c b/bsp/stm32f40x/applications/startup.c index c591ff3bcece2d39e22a3ed677be57883b0f5d5b..6894d0f8ce3cd98ccadf76e9daf7fe655a958105 100644 --- a/bsp/stm32f40x/applications/startup.c +++ b/bsp/stm32f40x/applications/startup.c @@ -26,10 +26,6 @@ /*@{*/ extern int rt_application_init(void); -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -extern void finsh_set_device(const char* device); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; @@ -88,12 +84,6 @@ void rtthread_startup(void) /* init application */ rt_application_init(); -#ifdef RT_USING_FINSH - /* init finsh */ - finsh_system_init(); - finsh_set_device( FINSH_DEVICE_NAME ); -#endif - /* init timer thread */ rt_system_timer_thread_init(); diff --git a/bsp/stm32f429-apollo/applications/startup.c b/bsp/stm32f429-apollo/applications/startup.c index c1cabf77795032a84215469640746c8159e0ef58..9e55b3bc40e63421b7b1be57a4c8045c6030e14d 100644 --- a/bsp/stm32f429-apollo/applications/startup.c +++ b/bsp/stm32f429-apollo/applications/startup.c @@ -26,10 +26,6 @@ /*@{*/ extern int rt_application_init(void); -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -extern void finsh_set_device(const char* device); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; diff --git a/bsp/stm32f429-disco/applications/application.c b/bsp/stm32f429-disco/applications/application.c index bfa3428eca0d6d3ca24ee40719d08f68b3328b9f..e6ad9e652ffb78382e1765951f011bf8acd924d5 100644 --- a/bsp/stm32f429-disco/applications/application.c +++ b/bsp/stm32f429-disco/applications/application.c @@ -16,6 +16,11 @@ #include #include +#ifdef RT_USING_FINSH +#include +#include +#endif + #ifdef RT_USING_LWIP #include #include @@ -50,6 +55,10 @@ void rt_init_thread_entry(void* parameter) rt_kprintf("TCP/IP initialized!\n"); } #endif + +#ifdef RT_USING_FINSH + finsh_system_init(); +#endif } int rt_application_init() diff --git a/bsp/stm32f429-disco/applications/startup.c b/bsp/stm32f429-disco/applications/startup.c index 845606b0e9fd473f16f464414bdf935e4c326a12..f7cf47ae6beda84f84f14419df9f7a5c59bf7d58 100644 --- a/bsp/stm32f429-disco/applications/startup.c +++ b/bsp/stm32f429-disco/applications/startup.c @@ -26,10 +26,6 @@ /*@{*/ extern int rt_application_init(void); -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -extern void finsh_set_device(const char* device); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; @@ -92,11 +88,6 @@ void rtthread_startup(void) /* init application */ rt_application_init(); -#ifdef RT_USING_FINSH - /* init finsh */ - finsh_system_init(); -#endif - /* init timer thread */ rt_system_timer_thread_init(); diff --git a/bsp/stm32f429_armfly/applications/startup.c b/bsp/stm32f429_armfly/applications/startup.c index 2015d8130d3f61b0c02e732257676cc7d4151861..63fa63123c9a8f77f53ea1f23d2ba06f3e4e73a9 100644 --- a/bsp/stm32f429_armfly/applications/startup.c +++ b/bsp/stm32f429_armfly/applications/startup.c @@ -26,11 +26,6 @@ /*@{*/ extern int rt_application_init(void); -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -extern void finsh_set_device(const char* device); -#endif - /******************************************************************************* * Function Name : assert_failed diff --git a/bsp/stm32l072/app/startup.c b/bsp/stm32l072/app/startup.c index 87c47a1e2caaa939e1e6ed99c30bda0ad81dba65..3722037db19006bc73130ed04009cf677e9f4de1 100644 --- a/bsp/stm32l072/app/startup.c +++ b/bsp/stm32l072/app/startup.c @@ -25,10 +25,6 @@ /*@{*/ extern int rt_application_init(void); -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -extern void finsh_set_device(const char* device); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; diff --git a/bsp/stm32l475-iot-disco/applications/startup.c b/bsp/stm32l475-iot-disco/applications/startup.c index 39dec62b61b5cec0fbe5a6596883da8b95efb066..f1e3c185bbc85d233a0adacf91b6ab829c05d561 100644 --- a/bsp/stm32l475-iot-disco/applications/startup.c +++ b/bsp/stm32l475-iot-disco/applications/startup.c @@ -26,10 +26,6 @@ /*@{*/ extern int rt_application_init(void); -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -extern void finsh_set_device(const char* device); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; diff --git a/bsp/stm32l476-nucleo/applications/startup.c b/bsp/stm32l476-nucleo/applications/startup.c index 03e5b04be82d077e2dc0d7944b9778f90601994a..84bf8e579ca561f137e6501ca168db319958948e 100644 --- a/bsp/stm32l476-nucleo/applications/startup.c +++ b/bsp/stm32l476-nucleo/applications/startup.c @@ -36,10 +36,6 @@ /*@{*/ extern int rt_application_init(void); -#ifdef RT_USING_FINSH -extern int finsh_system_init(void); -extern void finsh_set_device(const char* device); -#endif #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit;