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:
parent
8da1163675
commit
dd829e747c
|
@ -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();
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
/* Includes ------------------------------------------------------------------*/
|
||||
#include "sdcard.h"
|
||||
#include "stm32f10x_dma.h"
|
||||
#include "stm32f10x_sdio.h"
|
||||
#include <rtthread.h>
|
||||
|
||||
/** @addtogroup STM32F10x_StdPeriph_Examples
|
||||
|
|
Loading…
Reference in New Issue