X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_mtdif.c;h=5de3193ea2b9bba34e104760a4ec23027d3487bf;hp=13df3d98a8faa7bd4b71b641606f6b445e994786;hb=401f9eb48ce20b18902ad9a4a8039d43e363d2ec;hpb=f33ef96b57cb88ebf49cfb7f70c26dce4c46794b

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 13df3d9..5de3193 100644
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -1,8 +1,7 @@
 /*
- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
- * yaffs_mtdif.c  NAND mtd wrapper functions.
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -10,148 +9,44 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
  */
 
-const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.6 2005-07-31 08:38:41 marty Exp $";
- 
 #include "yportenv.h"
 
-#ifdef CONFIG_YAFFS_YAFFS1
 
 #include "yaffs_mtdif.h"
 
 #include "linux/mtd/mtd.h"
 #include "linux/types.h"
 #include "linux/time.h"
-
-#ifndef	CONFIG_YAFFS_USE_OLD_MTD
 #include "linux/mtd/nand.h"
-#endif
-
-static struct nand_oobinfo yaffs_oobinfo = {
-	.useecc = 1,
-	.eccpos = {8, 9, 10, 13, 14, 15}
-};
-
-static struct nand_oobinfo yaffs_noeccinfo = {
-	.useecc = 0,
-};
-
-
-int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_Spare *spare)
-{
-	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-	size_t dummy;
-    int retval = 0;
-	
-	loff_t addr = ((loff_t)chunkInNAND) * dev->nBytesPerChunk;
-	
-	__u8 *spareAsBytes = (__u8 *)spare;
-
-#ifndef	CONFIG_YAFFS_USE_OLD_MTD
-	if(data && spare)
-	{
-		if(dev->useNANDECC)
-			mtd->write_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,spareAsBytes,&yaffs_oobinfo);
-		else
-			mtd->write_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,spareAsBytes,&yaffs_noeccinfo);
-	}
-	else
-	{
-#endif
-	if(data)
-		retval = mtd->write(mtd,addr,dev->nBytesPerChunk,&dummy,data);
-	if(spare)
-		retval = mtd->write_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
-#ifndef	CONFIG_YAFFS_USE_OLD_MTD
-	}
-#endif
-
-    if (retval == 0)
-    	return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
-}
-
-int nandmtd_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Spare *spare)
-{
-	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-	size_t dummy;
-    int retval = 0;
-	
-	loff_t addr = ((loff_t)chunkInNAND) * dev->nBytesPerChunk;
-	
-	__u8 *spareAsBytes = (__u8 *)spare;
-	
-#ifndef	CONFIG_YAFFS_USE_OLD_MTD
-	if(data && spare)
-	{
-		if(dev->useNANDECC)
-		{   // Careful, this call adds 2 ints to the end of the spare data.  Calling function should
-            // allocate enough memory for spare, i.e. [YAFFS_BYTES_PER_SPARE+2*sizeof(int)].
-    		retval = mtd->read_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,spareAsBytes,&yaffs_oobinfo);            
-		}
-		else
-		{
-			retval = mtd->read_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,spareAsBytes,&yaffs_noeccinfo);
-		}
-	}
-	else
-	{
-#endif
-	if(data)
-		retval = mtd->read(mtd,addr,dev->nBytesPerChunk,&dummy,data);
-	if(spare)
-		retval = mtd->read_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
-#ifndef	CONFIG_YAFFS_USE_OLD_MTD
-	}
-#endif
-
-    if (retval == 0)
-    	return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
-}
-
-// Callback not needed for NAND
-#if 0
-static void nandmtd_EraseCallback(struct erase_info *ei)
-{
-	yaffs_Device *dev = (yaffs_Device *)ei->priv;	
-	up(&dev->sem);
-}
-#endif
 
+#include "yaffs_linux.h"
 
 int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 {
-	struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-	__u32 addr = ((loff_t) blockNumber) * dev->nBytesPerChunk * dev->nChunksPerBlock;
+	struct mtd_info *mtd = yaffs_DeviceToContext(dev)->mtd;
+	__u32 addr =
+	    ((loff_t) blockNumber) * dev->param.totalBytesPerChunk
+		* dev->param.nChunksPerBlock;
 	struct erase_info ei;
-    int retval = 0;
 	
+	int retval = 0;
+
 	ei.mtd = mtd;
 	ei.addr = addr;
-	ei.len = dev->nBytesPerChunk * dev->nChunksPerBlock;
+	ei.len = dev->param.totalBytesPerChunk * dev->param.nChunksPerBlock;
 	ei.time = 1000;
 	ei.retries = 2;
 	ei.callback = NULL;
-	ei.priv = (u_long)dev;
-	
-	// Todo finish off the ei if required
-	
-	sema_init(&dev->sem,0);
+	ei.priv = (u_long) dev;
 
-	retval = mtd->erase(mtd,&ei);	
-	
-	//No need for callback 
-	// down(&dev->sem); // Wait for the erasure to complete
+	retval = mtd->erase(mtd, &ei);
 
-    if (retval == 0)	
-    	return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
+	if (retval == 0)
+		return YAFFS_OK;
+	else
+		return YAFFS_FAIL;
 }
 
 int nandmtd_InitialiseNAND(yaffs_Device *dev)
@@ -159,5 +54,3 @@ int nandmtd_InitialiseNAND(yaffs_Device *dev)
 	return YAFFS_OK;
 }
 
-#endif // CONFIG_YAFFS_YAFFS1
-