fix elm file system compiling issue.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@512 bbd45198-f89e-11dd-88c7-29a3b14d5316

6 files changed, 27 insertions, 44 deletions

diff --git a/bsp/stm3210/project_107/application.c b/bsp/stm3210/project_107/application.c
index f929cae172..41c4725c0b 100644
--- a/bsp/stm3210/project_107/application.c
+++ b/bsp/stm3210/project_107/application.c
@@ -23,8 +23,8 @@
 #ifdef RT_USING_DFS

 /* dfs init */

 #include <dfs_init.h>

-/* dfs filesystem:EFS filesystem init */

-#include <dfs_efs.h>

+/* dfs filesystem:ELM filesystem init */

+#include <dfs_elm.h>

 /* dfs Filesystem APIs */

 #include <dfs_fs.h>

 #endif

@@ -43,18 +43,7 @@ void rt_init_thread_entry(void* parameter)
 		/* init the device filesystem */

 		dfs_init();

 

-#ifdef RT_USING_DFS_EFSL

-		/* init the efsl filesystam*/

-		efsl_init();

-

-		/* mount sd card fat partition 1 as root directory */

-		if (dfs_mount("sd0", "/", "efs", 0, 0) == 0)

-		{

-			rt_kprintf("File System initialized!\n");

-		}

-		else

-			rt_kprintf("File System initialzation failed!\n");

-#elif defined(RT_USING_DFS_ELMFAT)

+#ifdef RT_USING_DFS_ELMFAT

 		/* init the elm chan FatFs filesystam*/

 		elm_init();

 

diff --git a/bsp/stm3210/project_107/usart.c b/bsp/stm3210/project_107/usart.c
index efa426deb8..0876708d83 100644
--- a/bsp/stm3210/project_107/usart.c
+++ b/bsp/stm3210/project_107/usart.c
@@ -1,3 +1,17 @@
+/*

+ * File      : usart.c

+ * This file is part of RT-Thread RTOS

+ * COPYRIGHT (C) 2009, RT-Thread Development Team

+ *

+ * 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

+ * 2009-01-05     Bernard      the first version

+ */

+

 #include "usart.h"

 #include <serial.h>

 #include <stm32f10x_dma.h>

diff --git a/bsp/stm3210/project_filesystem/application.c b/bsp/stm3210/project_filesystem/application.c
index 698f4a9bf0..d4b20246e5 100644
--- a/bsp/stm3210/project_filesystem/application.c
+++ b/bsp/stm3210/project_filesystem/application.c
@@ -22,8 +22,6 @@
 #ifdef RT_USING_DFS

 /* dfs init */

 #include <dfs_init.h>

-/* dfs filesystem:EFS filesystem init */

-#include <dfs_efs.h>

 /* dfs filesystem:ELM FatFs filesystem init */

 #include <dfs_elm.h>

 /* dfs Filesystem APIs */

@@ -37,16 +35,7 @@ void rt_init_thread_entry(void* parameter)
 	{

         /* init the device filesystem */

         dfs_init();

-#ifdef RT_USING_DFS_EFSL

-        /* init the efsl filesystam*/

-        efsl_init();

-

-        /* mount sd card fat partition 1 as root directory */

-        if (dfs_mount("sd0", "/", "efs", 0, 0) == 0)

-            rt_kprintf("File System initialized!\n");

-        else

-            rt_kprintf("File System init failed!\n");

-#elif defined(RT_USING_DFS_ELMFAT)

+#ifdef RT_USING_DFS_ELMFAT

         /* init the elm FAT filesystam*/

         elm_init();

 

diff --git a/bsp/stm3210/project_full/application.c b/bsp/stm3210/project_full/application.c
index f929cae172..41c4725c0b 100644
--- a/bsp/stm3210/project_full/application.c
+++ b/bsp/stm3210/project_full/application.c
@@ -23,8 +23,8 @@
 #ifdef RT_USING_DFS

 /* dfs init */

 #include <dfs_init.h>

-/* dfs filesystem:EFS filesystem init */

-#include <dfs_efs.h>

+/* dfs filesystem:ELM filesystem init */

+#include <dfs_elm.h>

 /* dfs Filesystem APIs */

 #include <dfs_fs.h>

 #endif

@@ -43,18 +43,7 @@ void rt_init_thread_entry(void* parameter)
 		/* init the device filesystem */

 		dfs_init();

 

-#ifdef RT_USING_DFS_EFSL

-		/* init the efsl filesystam*/

-		efsl_init();

-

-		/* mount sd card fat partition 1 as root directory */

-		if (dfs_mount("sd0", "/", "efs", 0, 0) == 0)

-		{

-			rt_kprintf("File System initialized!\n");

-		}

-		else

-			rt_kprintf("File System initialzation failed!\n");

-#elif defined(RT_USING_DFS_ELMFAT)

+#ifdef RT_USING_DFS_ELMFAT

 		/* init the elm chan FatFs filesystam*/

 		elm_init();

 

diff --git a/bsp/stm3210/rtconfig.py b/bsp/stm3210/rtconfig.py
index 26ed7866a6..e49f2a2c31 100644
--- a/bsp/stm3210/rtconfig.py
+++ b/bsp/stm3210/rtconfig.py
@@ -5,8 +5,8 @@ import SCons.cpp
 # make all component false

 RT_USING_FINSH 		= False

 RT_USING_DFS 		= False

-RT_USING_DFS_EFSL 	= False

-RT_USING_DFS_YAFFS2 = False

+RT_USING_DFS_ELMFAT 	= False

+RT_USING_DFS_YAFFS2	= False

 RT_USING_LWIP 		= False

 RT_USING_WEBSERVER	= False

 RT_USING_RTGUI 		= False

@@ -27,8 +27,8 @@ if rtconfig_ns.has_key('RT_USING_FINSH'):
 if rtconfig_ns.has_key('RT_USING_DFS'):

     RT_USING_DFS = True

 

-    if rtconfig_ns.has_key('RT_USING_DFS_EFSL'):

-        RT_USING_DFS_EFSL = True

+    if rtconfig_ns.has_key('RT_USING_DFS_ELMFAT'):

+        RT_USING_DFS_ELMFAT = True

     if rtconfig_ns.has_key('RT_USING_DFS_YAFFS2'):

         RT_USING_DFS_YAFFS2 = True

 

diff --git a/bsp/stm3210/sdcard.c b/bsp/stm3210/sdcard.c
index c58f04a5f7..2a8aa35c71 100644
--- a/bsp/stm3210/sdcard.c
+++ b/bsp/stm3210/sdcard.c
@@ -20,6 +20,8 @@
 

 /* Includes ------------------------------------------------------------------*/

 #include "sdcard.h"

+#include "stm32f10x_dma.h"

+#include "stm32f10x_sdio.h"

 #include <rtthread.h>

 

 /** @addtogroup STM32F10x_StdPeriph_Examples