libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

fix elm file system compiling issue. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@512 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-03-18 09:39:26 +00:00
parent 8da1163675
commit dd829e747c
6 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bsp/stm3210/project_107/application.c
View File

@ -23,8 +23,8 @@
#ifdef RT_USING_DFS #ifdef RT_USING_DFS
/* dfs init */ /* dfs init */
#include <dfs_init.h> #include <dfs_init.h>
/* dfs filesystem:EFS filesystem init */ /* dfs filesystem:ELM 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
@ -43,18 +43,7 @@ void rt_init_thread_entry(void* parameter)
/* init the device filesystem */ /* init the device filesystem */
dfs_init(); dfs_init();
#ifdef RT_USING_DFS_EFSL #ifdef RT_USING_DFS_ELMFAT
/* 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)
/* init the elm chan FatFs filesystam*/ /* init the elm chan FatFs filesystam*/
elm_init(); elm_init();

14
bsp/stm3210/project_107/usart.c
View File

@ -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 "usart.h"
#include <serial.h> #include <serial.h>
#include <stm32f10x_dma.h> #include <stm32f10x_dma.h>

13
bsp/stm3210/project_filesystem/application.c
View File

@ -22,8 +22,6 @@
#ifdef RT_USING_DFS #ifdef RT_USING_DFS
/* dfs init */ /* dfs init */
#include <dfs_init.h> #include <dfs_init.h>
/* dfs filesystem:EFS filesystem init */
#include <dfs_efs.h>
/* dfs filesystem:ELM FatFs filesystem init */ /* dfs filesystem:ELM FatFs filesystem init */
#include <dfs_elm.h> #include <dfs_elm.h>
/* dfs Filesystem APIs */ /* dfs Filesystem APIs */
@ -37,16 +35,7 @@ void rt_init_thread_entry(void* parameter)
{ {
/* init the device filesystem */ /* init the device filesystem */
dfs_init(); dfs_init();
#ifdef RT_USING_DFS_EFSL #ifdef RT_USING_DFS_ELMFAT
/* 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)
/* init the elm FAT filesystam*/ /* init the elm FAT filesystam*/
elm_init(); elm_init();

17
bsp/stm3210/project_full/application.c
View File

@ -23,8 +23,8 @@
#ifdef RT_USING_DFS #ifdef RT_USING_DFS
/* dfs init */ /* dfs init */
#include <dfs_init.h> #include <dfs_init.h>
/* dfs filesystem:EFS filesystem init */ /* dfs filesystem:ELM 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
@ -43,18 +43,7 @@ void rt_init_thread_entry(void* parameter)
/* init the device filesystem */ /* init the device filesystem */
dfs_init(); dfs_init();
#ifdef RT_USING_DFS_EFSL #ifdef RT_USING_DFS_ELMFAT
/* 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)
/* init the elm chan FatFs filesystam*/ /* init the elm chan FatFs filesystam*/
elm_init(); elm_init();

8
bsp/stm3210/rtconfig.py
View File

@ -5,8 +5,8 @@ import SCons.cpp
# make all component false # make all component false
RT_USING_FINSH = False RT_USING_FINSH = False
RT_USING_DFS = False RT_USING_DFS = False
RT_USING_DFS_EFSL = False RT_USING_DFS_ELMFAT = False
RT_USING_DFS_YAFFS2 = False RT_USING_DFS_YAFFS2 = False
RT_USING_LWIP = False RT_USING_LWIP = False
RT_USING_WEBSERVER = False RT_USING_WEBSERVER = False
RT_USING_RTGUI = 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'): if rtconfig_ns.has_key('RT_USING_DFS'):
RT_USING_DFS = True RT_USING_DFS = True
if rtconfig_ns.has_key('RT_USING_DFS_EFSL'): if rtconfig_ns.has_key('RT_USING_DFS_ELMFAT'):
RT_USING_DFS_EFSL = True RT_USING_DFS_ELMFAT = True
if rtconfig_ns.has_key('RT_USING_DFS_YAFFS2'): if rtconfig_ns.has_key('RT_USING_DFS_YAFFS2'):
RT_USING_DFS_YAFFS2 = True RT_USING_DFS_YAFFS2 = True

2
bsp/stm3210/sdcard.c
View File

@ -20,6 +20,8 @@
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "sdcard.h" #include "sdcard.h"
#include "stm32f10x_dma.h"
#include "stm32f10x_sdio.h"
#include <rtthread.h> #include <rtthread.h>
/** @addtogroup STM32F10x_StdPeriph_Examples /** @addtogroup STM32F10x_StdPeriph_Examples