mtd/drivers/mtd/nand diskonchip.c,1.19,1.20

[dbrown at infradead.org]

Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv4847

Modified Files:
	diskonchip.c 
Log Message:
Move version code to increase DOS compatibility.  Detect and reject Millenium 8M.


Index: diskonchip.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/diskonchip.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- diskonchip.c	25 Jun 2004 14:38:59 -0000	1.19
+++ diskonchip.c	28 Jun 2004 16:27:43 -0000	1.20
@@ -894,13 +894,13 @@
 	this->bbt_td->options = NAND_BBT_ABSPAGE | NAND_BBT_8BIT |
 				NAND_BBT_SAVECONTENT | NAND_BBT_WRITE |
 				NAND_BBT_VERSION;
-	this->bbt_td->veroffs = 6;
+	this->bbt_td->veroffs = 7;
 	this->bbt_td->pages[0] = doc->mh0_page + 1;
 	if (doc->mh1_page != -1) {
 		this->bbt_md->options = NAND_BBT_ABSPAGE | NAND_BBT_8BIT |
 					NAND_BBT_SAVECONTENT | NAND_BBT_WRITE |
 					NAND_BBT_VERSION;
-		this->bbt_md->veroffs = 6;
+		this->bbt_md->veroffs = 7;
 		this->bbt_md->pages[0] = doc->mh1_page + 1;
 	} else {
 		this->bbt_md = NULL;
@@ -929,13 +929,24 @@
 		return -EIO;
 	}
 
+	if (mtd->size == (8<<20)) {
+#if 0
+/* This doesn't seem to work for me.  I get ECC errors on every page. */
+		/* The Millenium 8M is actually an NFTL device! */
+		mtd->name = "DiskOnChip Millennium 8M (NFTL)";
+		return nftl_scan_bbt(mtd);
+#endif
+		printk(KERN_ERR "DiskOnChip Millennium 8M is not supported.\n");
+		return -EIO;
+	}
+
 	this->bbt_td->options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT |
 				NAND_BBT_VERSION;
 	if (inftl_bbt_write)
 		this->bbt_td->options |= NAND_BBT_WRITE;
 	this->bbt_td->offs = 8;
 	this->bbt_td->len = 8;
-	this->bbt_td->veroffs = 6;
+	this->bbt_td->veroffs = 7;
 	this->bbt_td->maxblocks = INFTL_BBT_RESERVED_BLOCKS;
 	this->bbt_td->reserved_block_code = 0x01;
 	this->bbt_td->pattern = "MSYS_BBT";
@@ -946,7 +957,7 @@
 		this->bbt_md->options |= NAND_BBT_WRITE;
 	this->bbt_md->offs = 8;
 	this->bbt_md->len = 8;
-	this->bbt_md->veroffs = 6;
+	this->bbt_md->veroffs = 7;
 	this->bbt_md->maxblocks = INFTL_BBT_RESERVED_BLOCKS;
 	this->bbt_md->reserved_block_code = 0x01;
 	this->bbt_md->pattern = "TBB_SYSM";