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

update dfs_uffs.c to use uffs_Mount and uffs_UnMount function provided by official repo 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2020 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
goprife@gmail.com 2012-04-05 03:44:55 +00:00
parent 3484e839a8
commit 6e65fb482a
1 changed files with 6 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
components/dfs/filesystems/uffs/dfs_uffs.c
View File

@ -11,6 +11,7 @@
* Date Author Notes * Date Author Notes
* 2011-10-22 prife the first version * 2011-10-22 prife the first version
* 2012-03-28 prife use mtd device interface * 2012-03-28 prife use mtd device interface
* 2012-04-05 prife update uffs with official repo and use uffs_UnMount/Mount
*/ */
#include <rtthread.h> #include <rtthread.h>
@ -24,9 +25,6 @@
#include "uffs/uffs_mem.h" #include "uffs/uffs_mem.h"
#include "uffs/uffs_utils.h" #include "uffs/uffs_utils.h"
static URET uffs_mount_device(struct uffs_MountTableEntrySt *work);
static URET uffs_unmount_device(struct uffs_MountTableEntrySt *work);
static URET uffs_UnRegisterMountTable(uffs_MountTable *mtab);
/* /*
* RT-Thread DFS Interface for uffs * RT-Thread DFS Interface for uffs
*/ */
@ -139,7 +137,7 @@ static int init_uffs_fs(
uffs_RegisterMountTable(mtb); uffs_RegisterMountTable(mtb);
} }
/* mount uffs partion on nand device */ /* mount uffs partion on nand device */
return uffs_mount_device(mtb) == U_SUCC ? 0 : -1; return uffs_Mount(nand_part->mount_path) == U_SUCC ? 0 : -1;
} }
static int dfs_uffs_mount( static int dfs_uffs_mount(
@ -197,9 +195,9 @@ static int dfs_uffs_unmount(struct dfs_filesystem* fs)
if (nand_part[index].dev == RT_MTD_NAND_DEVICE(fs->dev_id)) if (nand_part[index].dev == RT_MTD_NAND_DEVICE(fs->dev_id))
{ {
nand_part[index].dev = RT_NULL; nand_part[index].dev = RT_NULL;
result = uffs_unmount_device(& nand_part[index].mount_table); result = uffs_UnMount(nand_part[index].mount_path);
if (result != U_SUCC) if (result != U_SUCC)
break; break;
result = uffs_UnRegisterMountTable(& nand_part[index].mount_table); result = uffs_UnRegisterMountTable(& nand_part[index].mount_table);
return (result == U_SUCC) ? DFS_STATUS_OK : -1; return (result == U_SUCC) ? DFS_STATUS_OK : -1;
@ -230,7 +228,7 @@ static int dfs_uffs_mkfs(const char* device_name)
} }
/*2. then unmount the partition */ /*2. then unmount the partition */
uffs_mount_device(&nand_part[index].mount_table); uffs_Mount(nand_part[index].mount_path);
mtd = nand_part[index].dev; mtd = nand_part[index].dev;
/*3. erase all blocks on the partition */ /*3. erase all blocks on the partition */
@ -663,71 +661,3 @@ int dfs_uffs_init(void)
} }
return -RT_ERROR; return -RT_ERROR;
} }
/* */
#include "uffs/uffs_public.h"
static URET uffs_mount_device(struct uffs_MountTableEntrySt *work)
{
int dev_num = 0;
work->dev->par.start = work->start_block;
if (work->end_block < 0) {
work->dev->par.end =
work->dev->attr->total_blocks + work->end_block;
}
else {
work->dev->par.end = work->end_block;
}
if (work->dev->Init(work->dev) == U_FAIL) {
return U_FAIL;
}
if (uffs_InitDevice(work->dev) != U_SUCC) {
return U_FAIL;
}
work->dev->dev_num = dev_num++;
return U_SUCC;
}
static URET uffs_unmount_device(struct uffs_MountTableEntrySt *work)
{
int result;
result = uffs_ReleaseDevice(work->dev);
work->dev->Release(work->dev);
return result;
#if 0
if (uffs_ReleaseObjectBuf() == U_SUCC) {
if (uffs_DirEntryBufRelease() == U_SUCC) {
uffs_ReleaseGlobalFsLock();
return U_SUCC;
}
}
return U_FAIL;
#endif
}
static URET uffs_UnRegisterMountTable(uffs_MountTable *mtab)
{
struct uffs_MountTableEntrySt *tbl = uffs_GetMountTable();
if (tbl == NULL || mtab == NULL)
return U_FAIL;
while (tbl)
{
if (tbl == mtab)
{
tbl = mtab->next;
mtab->next = NULL;
return U_SUCC;
}
tbl = tbl->next;
}
return U_FAIL;
}