X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=mtdemul%2Fnandemul2k.c;h=ecc96c8e7900ae6aa0fc180debf7694eb956d74e;hp=fe14d67587748f9cea2c4a2c4a5698bfc7fa2b47;hb=412a849e17d81802a45dbed775a6461c8c3a72c7;hpb=3e2677dfc7a44cfed8dd8bd571916a3c75ce3373

diff --git a/mtdemul/nandemul2k.c b/mtdemul/nandemul2k.c
index fe14d67..ecc96c8 100644
--- a/mtdemul/nandemul2k.c
+++ b/mtdemul/nandemul2k.c
@@ -35,8 +35,8 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand.h>
+#include "../yaffs_nandemul2k.h"
 
-#define T(f,x) printk x
 #define ALLOCATE(x) kmalloc(x,GFP_KERNEL)
 #define FREE(x)     kfree(x)
 
@@ -286,11 +286,16 @@ static int nand_write (struct mtd_info *mtd, loff_t to, size_t len,
 			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 *mtd, loff_t to, size_t len,
  */
 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_info *mtd, loff_t to, size_t len,
 /*
  * 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 *mtd, struct erase_info *instr)
 }
 
 
-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;
 }