diff --git a/bsp/stm3210/project_107/application.c b/bsp/stm3210/project_107/application.c index f3a37e583edd89c2013986920f1a60cac9e7bb7d..b88e7dee52b3c7aec910f1168b738b60761e0aec 100644 --- a/bsp/stm3210/project_107/application.c +++ b/bsp/stm3210/project_107/application.c @@ -42,6 +42,8 @@ void rt_init_thread_entry(void* parameter) { /* init the device filesystem */ dfs_init(); + +#ifdef RT_USING_DFS_EFSL /* init the efsl filesystam*/ efsl_init(); @@ -52,7 +54,18 @@ void rt_init_thread_entry(void* parameter) } else rt_kprintf("File System initialzation failed!\n"); +#elif defined(RT_USING_DFS_ELMFAT) + /* init the elm chan FatFs filesystam*/ + elm_init(); + /* mount sd card fat partition 1 as root directory */ + if (dfs_mount("sd0", "/", "elm", 0, 0) == 0) + { + rt_kprintf("File System initialized!\n"); + } + else + rt_kprintf("File System initialzation failed!\n"); +#endif } #endif diff --git a/bsp/stm3210/startup.c b/bsp/stm3210/startup.c index e880f858049cd979ba6f0fe0cd6501ceb4dd399b..0ee8ddbde41b39ac09ddbfa264b7f723511f10f7 100644 --- a/bsp/stm3210/startup.c +++ b/bsp/stm3210/startup.c @@ -26,7 +26,11 @@ /*@{*/ #ifdef RT_USING_LWIP -#include "enc28j60.h" +#ifdef STM32F10X_CL + extern void rt_hw_stm32_eth_init(void); +#else + #include "enc28j60.h" +#endif #include #endif @@ -36,6 +40,7 @@ extern void finsh_system_init(void); extern void finsh_set_device(const char* device); #endif +/* bss end definitions for heap init */ #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; #elif __ICCARM__ @@ -104,18 +109,25 @@ void rtthread_startup(void) /* init hardware serial device */ rt_hw_usart_init(); + +#ifdef RT_USING_DFS /* init sdcard driver */ #if STM32_USE_SDIO rt_hw_sdcard_init(); #else rt_hw_msd_init(); #endif +#endif #ifdef RT_USING_LWIP eth_system_device_init(); /* register ethernetif device */ +#ifdef STM32F10X_CL + rt_hw_stm32_eth_init(); +#else rt_hw_enc28j60_init(); +#endif #endif rt_hw_rtc_init(); @@ -129,7 +141,7 @@ void rtthread_startup(void) #ifdef RT_USING_FINSH /* init finsh */ finsh_system_init(); - finsh_set_device("uart1"); + finsh_set_device(FINSH_DEVICE_NAME); #endif /* init idle thread */