From 29df97e5cd32cacf66a7670719da3feaa7fd4723 Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Fri, 10 Feb 2012 11:49:44 +0000 Subject: [PATCH] remove cyg_* type in flashio.c git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1942 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/dfs/filesystems/jffs2/src/flashio.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/components/dfs/filesystems/jffs2/src/flashio.c b/components/dfs/filesystems/jffs2/src/flashio.c index b69206b35..0bd3743f5 100644 --- a/components/dfs/filesystems/jffs2/src/flashio.c +++ b/components/dfs/filesystems/jffs2/src/flashio.c @@ -16,38 +16,33 @@ #include "nodelist.h" #include -#define PAGE_SIZE 1024 - -int jffs2_flash_read(struct jffs2_sb_info * c, cyg_uint32 offset, +int jffs2_flash_read(struct jffs2_sb_info * c, uint32_t offset, const size_t size, size_t * return_size, unsigned char *buffer) { - cyg_uint32 len; + uint32_t len; struct super_block *sb = OFNI_BS_2SFFJ(c); len = rt_mtd_read(RT_MTD_DEVICE(sb->s_dev), offset, buffer, size); if (len != size) return -EIO; - //rt_kprintf("fread: offset %d, size %d, ret size %d\n", - // offset, size, *return_size); + * return_size = len; return ENOERR; } int jffs2_flash_write(struct jffs2_sb_info * c, - cyg_uint32 offset, const size_t size, + uint32_t offset, const size_t size, size_t * return_size, unsigned char *buffer) { - cyg_uint32 len; + uint32_t len; struct super_block *sb = OFNI_BS_2SFFJ(c); len = rt_mtd_write(RT_MTD_DEVICE(sb->s_dev), offset, buffer, size); if (len != size) return -EIO; - //rt_kprintf("fwrite: offset %d, size %d, ret size %d\n", - // offset, size, *return_size); * return_size = len; return ENOERR; } @@ -58,8 +53,6 @@ int jffs2_flash_erase(struct jffs2_sb_info * c, rt_err_t result; struct super_block *sb = OFNI_BS_2SFFJ(c); - //rt_kprintf("erase: offset %d\n", jeb->offset); - result = rt_mtd_erase_block(RT_MTD_DEVICE(sb->s_dev), jeb->offset); if (result != RT_EOK) return -EIO;