chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revert to r2247 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2250 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
goprife@gmail.com 2012-08-08 15:43:07 +00:00
parent 3675f263cb
commit 3dbbc479fc
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/dfs/filesystems/elmfat/dfs_elm.c
View File

@ -103,27 +103,7 @@ int dfs_elm_mount(struct dfs_filesystem *fs, unsigned long rwflag, const void *d
/* mount fatfs, always 0 logic driver */ /* mount fatfs, always 0 logic driver */
result = f_mount(index, fat); result = f_mount(index, fat);
if (result == FR_OK) 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; fs->data = fat;
}
else else
{ {
rt_free(fat); rt_free(fat);

7
components/dfs/filesystems/elmfat/ff.c
View File

@ -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 */ /* Check if the file system object is valid or not */
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static
FRESULT chk_mounted ( /* FR_OK(0): successful, !=0: any error occurred */ FRESULT chk_mounted ( /* FR_OK(0): successful, !=0: any error occurred */
const TCHAR **path, /* Pointer to pointer to the path name (drive number) */ const TCHAR **path, /* Pointer to pointer to the path name (drive number) */
FATFS **rfs, /* Pointer to pointer to the found file system object */ FATFS **rfs, /* Pointer to pointer to the found file system object */
@ -4019,8 +4019,3 @@ int elm_get_vol(FATFS *fat)
return -1; return -1;
} }
#endif #endif
int leavefs(FATFS* fs, int res)
{
LEAVE_FF(fs, res);
}