Browse Source

change efsl filesystem to elm fatfs filesystem.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@460 bbd45198-f89e-11dd-88c7-29a3b14d5316
bernard.xiong 15 years ago
parent
commit
162f120fdd
3 changed files with 8 additions and 18 deletions
  1. 1 1
      bsp/stm3210/application.c
  2. 5 15
      bsp/stm3210/project.Uv2
  3. 2 2
      bsp/stm3210/rtconfig.h

+ 1 - 1
bsp/stm3210/application.c

@@ -24,7 +24,7 @@
 /* dfs init */
 /* dfs init */
 #include <dfs_init.h>
 #include <dfs_init.h>
 /* dfs filesystem:EFS filesystem init */
 /* dfs filesystem:EFS filesystem init */
-#include <dfs_efs.h>
+#include <dfs_elm.h>
 /* dfs Filesystem APIs */
 /* dfs Filesystem APIs */
 #include <dfs_fs.h>
 #include <dfs_fs.h>
 #endif
 #endif

+ 5 - 15
bsp/stm3210/project.Uv2

@@ -84,22 +84,12 @@ File 6,1,<..\..\finsh\finsh_var.c><finsh_var.c>
 File 6,1,<..\..\finsh\finsh_vm.c><finsh_vm.c>
 File 6,1,<..\..\finsh\finsh_vm.c><finsh_vm.c>
 File 6,1,<..\..\finsh\shell.c><shell.c>
 File 6,1,<..\..\finsh\shell.c><shell.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_util.c><dfs_util.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_util.c><dfs_util.c>
-File 7,1,<..\..\filesystem\dfs\src\dfs_cache.c><dfs_cache.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_fs.c><dfs_fs.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_fs.c><dfs_fs.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_init.c><dfs_init.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_init.c><dfs_init.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_posix.c><dfs_posix.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_posix.c><dfs_posix.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_raw.c><dfs_raw.c>
 File 7,1,<..\..\filesystem\dfs\src\dfs_raw.c><dfs_raw.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\plibc.c><plibc.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\efs.c><efs.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\extract.c><extract.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\partition.c><partition.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ui.c><ui.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\dir.c><dir.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fat.c><fat.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\file.c><file.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fs.c><fs.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ls.c><ls.c>
-File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\time.c><time.c>
+File 7,1,<..\..\filesystem\dfs\filesystems\elmfat\ff.c><ff.c>
+File 7,1,<..\..\filesystem\dfs\filesystems\elmfat\dfs_elm.c><dfs_elm.c>
 File 8,1,<..\..\net\lwip\src\core\dhcp.c><dhcp.c>
 File 8,1,<..\..\net\lwip\src\core\dhcp.c><dhcp.c>
 File 8,1,<..\..\net\lwip\src\core\dns.c><dns.c>
 File 8,1,<..\..\net\lwip\src\core\dns.c><dns.c>
 File 8,1,<..\..\net\lwip\src\core\init.c><init.c>
 File 8,1,<..\..\net\lwip\src\core\init.c><init.c>
@@ -193,7 +183,7 @@ Options 1,0,0  // Target 'RT-Thread STM32'
  ADSCMISC ()
  ADSCMISC ()
  ADSCDEFN (USE_STDPERIPH_DRIVER, STM32F10X_HD,)
  ADSCDEFN (USE_STDPERIPH_DRIVER, STM32F10X_HD,)
  ADSCUDEF ()
  ADSCUDEF ()
- ADSCINCD (.\Libraries\STM32F10x_StdPeriph_Driver\inc;.\Libraries\CMSIS\Core\CM3;..\..\include;.;..\..\libcpu\arm\stm32;..\..\filesystem\dfs;..\..\filesystem\dfs\include;..\..\filesystem\dfs\filesystems\efsl\src\include;..\..\filesystem\dfs\filesystems\efsl\src\base\include;..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\include;..\..\net\lwip\src;..\..\net\lwip\src\include;..\..\net\lwip\src\arch\include;..\..\net\lwip\src\include\ipv4;..\..\finsh)
+ ADSCINCD (.\Libraries\STM32F10x_StdPeriph_Driver\inc;.\Libraries\CMSIS\Core\CM3;..\..\include;.;..\..\libcpu\arm\stm32;..\..\filesystem\dfs;..\..\filesystem\dfs\include;..\..\net\lwip\src;..\..\net\lwip\src\include;..\..\net\lwip\src\arch\include;..\..\net\lwip\src\include\ipv4;..\..\finsh)
  ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
  ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
  ADSAMISC ()
  ADSAMISC ()
  ADSADEFN ()
  ADSADEFN ()
@@ -217,8 +207,8 @@ Options 1,0,0  // Target 'RT-Thread STM32'
  ADSLDMC (--keep __fsym_* --keep __vsym_*)
  ADSLDMC (--keep __fsym_* --keep __vsym_*)
  ADSLDIF ()
  ADSLDIF ()
  ADSLDDW ()
  ADSLDDW ()
-  OPTDL (SARMCM3.DLL)()(DARMSTM.DLL)(-pSTM32F103ZE)(SARMCM3.DLL)()(TARMSTM.DLL)(-pSTM32F103ZE)
-  OPTDBG 49150,7,()()()()()()()()()() (Segger\JL2CM3.dll)()()()
+  OPTDL (SARMCM3.DLL)()(DARMSTM.DLL)(-pSTM32F107xCSchedule)(SARMCM3.DLL)()(TARMSTM.DLL)(-pSTM32F107xC)
+  OPTDBG 49149,7,()()()()()()()()()() (Segger\JL2CM3.dll)()()()
  FLASH1 { 9,0,0,0,1,0,0,0,6,16,0,0,0,0,0,0,0,0,0,0 }
  FLASH1 { 9,0,0,0,1,0,0,0,6,16,0,0,0,0,0,0,0,0,0,0 }
  FLASH2 (Segger\JL2CM3.dll)
  FLASH2 (Segger\JL2CM3.dll)
  FLASH3 ("" ())
  FLASH3 ("" ())

+ 2 - 2
bsp/stm3210/rtconfig.h

@@ -74,8 +74,8 @@
 
 
 /* SECTION: device filesystem support */
 /* SECTION: device filesystem support */
 #define RT_USING_DFS
 #define RT_USING_DFS
-#define RT_USING_DFS_EFSL
-/* #define RT_USING_DFS_ELMFAT */
+#define RT_USING_DFS_ELMFAT
+#define RT_DFS_ELM_WORD_ACCESS
 
 
 /* the max number of mounted filesystem */
 /* the max number of mounted filesystem */
 #define DFS_FILESYSTEMS_MAX			2
 #define DFS_FILESYSTEMS_MAX			2