Mercurial > yaffs-ecoscentric

diff mtdemul/nandemul2k.c @ 36:1b497ab38b8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some declarations mismatch between the MTD interface and the implementation in nandemul2k.c: constness problems, iovec vs. kvec and int vs. loff_t
author luc
date Fri, 29 Jul 2005 21:19:06 +0100
parents 9b3779778afb
children 92b57d2d0c7b
line wrap: on
line diff
--- a/mtdemul/nandemul2k.c
+++ b/mtdemul/nandemul2k.c
@@ -286,11 +286,16 @@ static int nand_write (struct mtd_info *
 			size_t *retlen, const u_char *buf);
 static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
 				size_t *retlen, const u_char *buf,
-				const u_char *oob_buf, struct nand_oobinfo *dummy);
+				u_char *oob_buf, struct nand_oobinfo *dummy);
 static int nand_write_oob (struct mtd_info *mtd, loff_t to, size_t len,
 				size_t *retlen, const u_char *buf);
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,7))
+static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs,
+				unsigned long count, loff_t to, size_t *retlen);
+#else
 static int nand_writev (struct mtd_info *mtd, const struct iovec *vecs,
 				unsigned long count, loff_t to, size_t *retlen);
+#endif
 static int nand_erase (struct mtd_info *mtd, struct erase_info *instr);
 static void nand_sync (struct mtd_info *mtd);
 
@@ -413,7 +418,7 @@ static int nand_write (struct mtd_info *
  */
 static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
 				size_t *retlen, const u_char *buf,
-				const u_char *oob_buf, struct nand_oobinfo *dummy)
+				u_char *oob_buf, struct nand_oobinfo *dummy)
 {
 
 	int 	start, page;
@@ -509,8 +514,13 @@ static int nand_write_oob (struct mtd_in
 /*
  * NAND write with iovec
  */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,7))
+static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs,
+				unsigned long count, loff_t to, size_t *retlen)
+#else
 static int nand_writev (struct mtd_info *mtd, const struct iovec *vecs,
 				unsigned long count, loff_t to, size_t *retlen)
+#endif
 {
 	return -EINVAL;
 }
@@ -564,12 +574,12 @@ static int nand_erase (struct mtd_info *
 }
 
 
-int nand_block_isbad(struct mtd_info *mtd,int blockNo)
+static int nand_block_isbad(struct mtd_info *mtd, loff_t ofs)
 {
 	return 0;
 }
 
-int nand_block_markbad(struct mtd_info *mtd, int blockNo)
+static int nand_block_markbad(struct mtd_info *mtd, loff_t ofs)
 {
 	return 0;
 }