X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=patches%2Fyaffs_mtdif2.c;h=c817a3ad32a33c39d0fb6cdf5f207d742fdf1ed0;hb=b19d3c9f0ada46534e44308f72d7e70ab1e301ee;hp=181484341abbef0015f755556302dbff4cc55457;hpb=976dbeae825b18e6759f3903073a6784248cc244;p=yaffs2.git

diff --git a/patches/yaffs_mtdif2.c b/patches/yaffs_mtdif2.c
index 1814843..c817a3a 100644
--- a/patches/yaffs_mtdif2.c
+++ b/patches/yaffs_mtdif2.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet another FFS. A NAND-flash specific file system. 
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -48,7 +47,7 @@ void nandmtd2_pt2buf(struct yaffs_dev *dev, yaffs_PackedTags2 *pt, int is_raw)
 
 		if (n == 0) {
 			T(YAFFS_TRACE_ERROR, (TSTR("No OOB space for tags" TENDSTR)));
-			YBUG();
+			BUG();
 		}
 
 		for (i = 0; i < sizeof(yaffs_PackedTags2); i++) {
@@ -58,7 +57,7 @@ void nandmtd2_pt2buf(struct yaffs_dev *dev, yaffs_PackedTags2 *pt, int is_raw)
 				n = mtd->oobinfo.oobfree[j][1];
 				if (n == 0) {
 					T(YAFFS_TRACE_ERROR, (TSTR("No OOB space for tags" TENDSTR)));
-					YBUG();
+					BUG();
 				}
 			}
 			dev->spareBuffer[k] = ptab[i];
@@ -86,7 +85,7 @@ void nandmtd2_buf2pt(struct yaffs_dev *dev, yaffs_PackedTags2 *pt, int is_raw)
 
 		if (n == 0) {
 			T(YAFFS_TRACE_ERROR, (TSTR("No space in OOB for tags" TENDSTR)));
-			YBUG();
+			BUG();
 		}
 
 		for (i = 0; i < sizeof(yaffs_PackedTags2); i++) {
@@ -96,7 +95,7 @@ void nandmtd2_buf2pt(struct yaffs_dev *dev, yaffs_PackedTags2 *pt, int is_raw)
 				n = mtd->oobinfo.oobfree[j][1];
 				if (n == 0) {
 					T(YAFFS_TRACE_ERROR, (TSTR("No space in OOB for tags" TENDSTR)));
-					YBUG();
+					BUG();
 				}
 			}
 			ptab[i] = dev->spareBuffer[k];
@@ -140,7 +139,7 @@ int nandmtd2_WriteChunkWithTagsToNAND(struct yaffs_dev * dev, int nand_chunk,
 		T(YAFFS_TRACE_ALWAYS,
 		  (TSTR
 		  ("Write chunk with null tags or data!" TENDSTR)));
-		YBUG();
+		BUG();
  	}
 
 	if (retval == 0)
@@ -213,7 +212,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
 }
 
 int nandmtd2_QueryNANDBlock(struct yaffs_dev *dev, int block_no,
-			    yaffs_block_state_t * state, int *seq_number)
+			    enum yaffs_block_state * state, int *seq_number)
 {
 	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
 	int retval;