Răsfoiți Sursa

remove cyg_* type in flashio.c

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1942 bbd45198-f89e-11dd-88c7-29a3b14d5316
bernard.xiong@gmail.com 13 ani în urmă
părinte
comite
29df97e5cd
1 a modificat fișierele cu 5 adăugiri și 12 ștergeri
  1. 5 12
      components/dfs/filesystems/jffs2/src/flashio.c

+ 5 - 12
components/dfs/filesystems/jffs2/src/flashio.c

@@ -16,38 +16,33 @@
 #include "nodelist.h"
 #include "nodelist.h"
 #include <rtdevice.h>
 #include <rtdevice.h>
 
 
-#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,
 		const size_t size,
 		size_t * return_size,
 		size_t * return_size,
 		unsigned char *buffer)
 		unsigned char *buffer)
 {
 {
-	cyg_uint32 len;
+	uint32_t len;
 	struct super_block *sb = OFNI_BS_2SFFJ(c);
 	struct super_block *sb = OFNI_BS_2SFFJ(c);
 
 
 	len = rt_mtd_read(RT_MTD_DEVICE(sb->s_dev), offset, buffer, size);
 	len = rt_mtd_read(RT_MTD_DEVICE(sb->s_dev), offset, buffer, size);
 	if (len != size)
 	if (len != size)
 		return -EIO;
 		return -EIO;
-	//rt_kprintf("fread: offset %d, size %d, ret size %d\n",
-	//		offset, size, *return_size);
+
 	* return_size = len;
 	* return_size = len;
 	return ENOERR;
 	return ENOERR;
 }
 }
 
 
 int jffs2_flash_write(struct jffs2_sb_info * c,
 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)
 		size_t * return_size, unsigned char *buffer)
 {
 {
-	cyg_uint32 len;
+	uint32_t len;
 	struct super_block *sb = OFNI_BS_2SFFJ(c);
 	struct super_block *sb = OFNI_BS_2SFFJ(c);
 
 
 	len = rt_mtd_write(RT_MTD_DEVICE(sb->s_dev), offset, buffer, size);
 	len = rt_mtd_write(RT_MTD_DEVICE(sb->s_dev), offset, buffer, size);
 	if (len != size)
 	if (len != size)
 		return -EIO;
 		return -EIO;
 
 
-	//rt_kprintf("fwrite: offset %d, size %d, ret size %d\n",
-	//		offset, size, *return_size);
 	* return_size = len;
 	* return_size = len;
 	return ENOERR;
 	return ENOERR;
 }
 }
@@ -58,8 +53,6 @@ int jffs2_flash_erase(struct jffs2_sb_info * c,
 	rt_err_t result;
 	rt_err_t result;
 	struct super_block *sb = OFNI_BS_2SFFJ(c);
 	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);
 	result = rt_mtd_erase_block(RT_MTD_DEVICE(sb->s_dev), jeb->offset);
 	if (result != RT_EOK)
 	if (result != RT_EOK)
 		return -EIO;
 		return -EIO;