Change yboot.c to LGPL as was intended

[yaffs/.git] / yaffs_mtdif.c

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 7ada87a8c37216373b01654d85d9a6e3482f6039..6dede1a55259b29d30ac8bfff80a773da0475373 100644 (file)
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -13,7 +13,7 @@
  *
  */
 
-const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.7 2003-01-17 04:19:08 charles Exp $";
+const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.10 2004-09-19 08:14:50 charles Exp $";
 
 #ifdef CONFIG_YAFFS_MTD_ENABLED
  
@@ -29,6 +29,20 @@ const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.7 2003-01-17 04:19:0
 #include "linux/mtd/nand.h"
 #endif
 
+struct nand_oobinfo yaffs_oobinfo = {
+       useecc: 1,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,8))
+// this is for versions of mtd nand driver in kernel 2.6.8 and later
+       eccbytes: 6,
+#endif
+       eccpos: {8, 9, 10, 13, 14, 15}
+};
+
+struct nand_oobinfo yaffs_noeccinfo = {
+       useecc: 0,
+};
+
+
 int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, yaffs_Spare *spare)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
@@ -43,9 +57,9 @@ int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data,
        if(data && spare)
        {
                if(dev->useNANDECC)
-                       mtd->write_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,spareAsBytes,NAND_YAFFS_OOB);
+                       mtd->write_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,spareAsBytes,&yaffs_oobinfo);
                else
-                       mtd->write_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,spareAsBytes,NAND_NONE_OOB);
+                       mtd->write_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,spareAsBytes,&yaffs_noeccinfo);
        }
        else
        {
@@ -78,14 +92,13 @@ int nandmtd_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaf
        if(data && spare)
        {
                if(dev->useNANDECC)
-               {
-                       u8 tmpSpare[ YAFFS_BYTES_PER_SPARE + (2*sizeof(int)) ];
-                       retval = mtd->read_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,tmpSpare,NAND_YAFFS_OOB);
-                       memcpy(spareAsBytes, tmpSpare, YAFFS_BYTES_PER_SPARE);
+               {   // 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,NAND_NONE_OOB);
+                       retval = mtd->read_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,spareAsBytes,&yaffs_noeccinfo);
                }
        }
        else
@@ -105,12 +118,14 @@ int nandmtd_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaf
         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
 
 
 int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
@@ -125,7 +140,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
        ei.len = dev->nBytesPerChunk * dev->nChunksPerBlock;
        ei.time = 1000;
        ei.retries = 2;
-       ei.callback = nandmtd_EraseCallback;
+       ei.callback = NULL;
        ei.priv = (u_long)dev;
        
        // Todo finish off the ei if required
@@ -134,7 +149,8 @@ int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 
        retval = mtd->erase(mtd,&ei);   
        
-       down(&dev->sem); // Wait for the erasure to complete
+       //No need for callback 
+       // down(&dev->sem); // Wait for the erasure to complete
 
     if (retval == 0)   
        return YAFFS_OK;