From 3dbbc479fc035af88c89d9e836a875b7248898b2 Mon Sep 17 00:00:00 2001 From: "goprife@gmail.com" Date: Wed, 8 Aug 2012 15:43:07 +0000 Subject: [PATCH] revert to r2247 git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2250 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/dfs/filesystems/elmfat/dfs_elm.c | 20 -------------------- components/dfs/filesystems/elmfat/ff.c | 7 +------ 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/components/dfs/filesystems/elmfat/dfs_elm.c b/components/dfs/filesystems/elmfat/dfs_elm.c index 08218b1461..c2ccac1a89 100644 --- a/components/dfs/filesystems/elmfat/dfs_elm.c +++ b/components/dfs/filesystems/elmfat/dfs_elm.c @@ -103,27 +103,7 @@ int dfs_elm_mount(struct dfs_filesystem *fs, unsigned long rwflag, const void *d /* mount fatfs, always 0 logic driver */ result = f_mount(index, fat); if (result == FR_OK) - { - extern FRESULT chk_mounted(const TCHAR **path, FATFS **rfs, BYTE chk_wp); - extern int leavefs(FATFS* fs, int res); - char driver[16]; - const char * path; - DIR dj; - path = (const char *)driver; - rt_snprintf(driver, sizeof(driver), "%d:/", fat->drv); -#if !_FS_READONLY - result = chk_mounted(&path, &dj.fs, 1); -#else - result = chk_mounted(&path, &dj.fs, 0); -#endif - if (result != FR_OK) - { - rt_free(fat); - return -1; - } - leavefs(dj.fs, result); fs->data = fat; - } else { rt_free(fat); diff --git a/components/dfs/filesystems/elmfat/ff.c b/components/dfs/filesystems/elmfat/ff.c index c8c27f6c0a..e967bc76d7 100644 --- a/components/dfs/filesystems/elmfat/ff.c +++ b/components/dfs/filesystems/elmfat/ff.c @@ -2004,7 +2004,7 @@ BYTE check_fs ( /* 0:The FAT BR, 1:Valid BR but not an FAT, 2:Not a BR, 3:Disk e /* Check if the file system object is valid or not */ /*-----------------------------------------------------------------------*/ - +static FRESULT chk_mounted ( /* FR_OK(0): successful, !=0: any error occurred */ const TCHAR **path, /* Pointer to pointer to the path name (drive number) */ FATFS **rfs, /* Pointer to pointer to the found file system object */ @@ -4019,8 +4019,3 @@ int elm_get_vol(FATFS *fat) return -1; } #endif - -int leavefs(FATFS* fs, int res) -{ - LEAVE_FF(fs, res); -}