From 162f120fdd5e21f6a0e360e4face0a6f7c266dd6 Mon Sep 17 00:00:00 2001 From: "bernard.xiong" Date: Wed, 3 Mar 2010 09:22:47 +0000 Subject: [PATCH] change efsl filesystem to elm fatfs filesystem. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@460 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/stm3210/application.c | 2 +- bsp/stm3210/project.Uv2 | 20 +++++--------------- bsp/stm3210/rtconfig.h | 4 ++-- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/bsp/stm3210/application.c b/bsp/stm3210/application.c index 41e52bfa5..1737067e3 100644 --- a/bsp/stm3210/application.c +++ b/bsp/stm3210/application.c @@ -24,7 +24,7 @@ /* dfs init */ #include /* dfs filesystem:EFS filesystem init */ -#include +#include /* dfs Filesystem APIs */ #include #endif diff --git a/bsp/stm3210/project.Uv2 b/bsp/stm3210/project.Uv2 index 6dfe8a398..f49c3a673 100644 --- a/bsp/stm3210/project.Uv2 +++ b/bsp/stm3210/project.Uv2 @@ -84,22 +84,12 @@ File 6,1,<..\..\finsh\finsh_var.c> File 6,1,<..\..\finsh\finsh_vm.c> File 6,1,<..\..\finsh\shell.c> File 7,1,<..\..\filesystem\dfs\src\dfs_util.c> -File 7,1,<..\..\filesystem\dfs\src\dfs_cache.c> File 7,1,<..\..\filesystem\dfs\src\dfs_fs.c> File 7,1,<..\..\filesystem\dfs\src\dfs_init.c> File 7,1,<..\..\filesystem\dfs\src\dfs_posix.c> File 7,1,<..\..\filesystem\dfs\src\dfs_raw.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\plibc.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\efs.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\extract.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\base\partition.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ui.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\dir.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fat.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\file.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\fs.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\ls.c> -File 7,1,<..\..\filesystem\dfs\filesystems\efsl\src\fs\vfat\time.c> +File 7,1,<..\..\filesystem\dfs\filesystems\elmfat\ff.c> +File 7,1,<..\..\filesystem\dfs\filesystems\elmfat\dfs_elm.c> File 8,1,<..\..\net\lwip\src\core\dhcp.c> File 8,1,<..\..\net\lwip\src\core\dns.c> File 8,1,<..\..\net\lwip\src\core\init.c> @@ -193,7 +183,7 @@ Options 1,0,0 // Target 'RT-Thread STM32' ADSCMISC () ADSCDEFN (USE_STDPERIPH_DRIVER, STM32F10X_HD,) 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 } ADSAMISC () ADSADEFN () @@ -217,8 +207,8 @@ Options 1,0,0 // Target 'RT-Thread STM32' ADSLDMC (--keep __fsym_* --keep __vsym_*) ADSLDIF () 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 } FLASH2 (Segger\JL2CM3.dll) FLASH3 ("" ()) diff --git a/bsp/stm3210/rtconfig.h b/bsp/stm3210/rtconfig.h index 0c9b9c4ef..5e4ffa122 100644 --- a/bsp/stm3210/rtconfig.h +++ b/bsp/stm3210/rtconfig.h @@ -74,8 +74,8 @@ /* SECTION: device filesystem support */ #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 */ #define DFS_FILESYSTEMS_MAX 2