X-Git-Url: https://yaffs.net/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_mtdif2_single.c;fp=yaffs_mtd1f2_single.c;h=667d129adafce954631e6809defb1ac32f4ca142;hp=d798a1f9c23fe1beab897a27ed2f5a7e1f3ab2df;hb=9131fecc79ad4e5fbdb775cdc067bc80aae5adb8;hpb=976dbeae825b18e6759f3903073a6784248cc244

diff --git a/yaffs_mtd1f2_single.c b/yaffs_mtdif2_single.c
similarity index 92%
rename from yaffs_mtd1f2_single.c
rename to yaffs_mtdif2_single.c
index d798a1f..667d129 100644
--- a/yaffs_mtd1f2_single.c
+++ b/yaffs_mtdif2_single.c
@@ -34,7 +34,7 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 				      const u8 *data,
 				      const struct yaffs_ext_tags *tags)
 {
-	struct mtd_info *mtd = struct yaffs_devo_mtd(dev);
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
 	struct mtd_oob_ops ops;
 	int retval = 0;
 
@@ -84,7 +84,7 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 				       u8 *data, struct yaffs_ext_tags *tags)
 {
-	struct mtd_info *mtd = struct yaffs_devo_mtd(dev);
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
 	struct mtd_oob_ops ops;
 
 	size_t dummy;
@@ -123,7 +123,7 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 		ops.len = data ? dev->data_bytes_per_chunk : packed_tags_size;
 		ops.ooboffs = 0;
 		ops.datbuf = data;
-		ops.oobbuf = struct yaffs_devo_lc(dev)->spare_buffer;
+		ops.oobbuf = yaffs_dev_to_lc(dev)->spare_buffer;
 		retval = mtd->read_oob(mtd, addr, &ops);
 	}
 
@@ -135,7 +135,7 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 		}
 	} else {
 		if (tags) {
-			memcpy(packed_tags_ptr, struct yaffs_devo_lc(dev)->spare_buffer, packed_tags_size);
+			memcpy(packed_tags_ptr, yaffs_dev_to_lc(dev)->spare_buffer, packed_tags_size);
 			yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc);
 		}
 	}
@@ -159,7 +159,7 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 
 int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no)
 {
-	struct mtd_info *mtd = struct yaffs_devo_mtd(dev);
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
 	int retval;
 	T(YAFFS_TRACE_MTD,
 	  (TSTR("nandmtd2_mark_block_bad %d" TENDSTR), block_no));
@@ -177,9 +177,9 @@ int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no)
 }
 
 int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
-			    yaffs_block_state_t *state, u32 *seq_number)
+			    enum yaffs_block_state *state, u32 *seq_number)
 {
-	struct mtd_info *mtd = struct yaffs_devo_mtd(dev);
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
 	int retval;
 
 	T(YAFFS_TRACE_MTD,