Bounds check on ecc correction
[yaffs2.git] / yaffs_mtdif.c
index 2dfc705..7dbf07a 100644 (file)
  *
  */
 
-const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.1 2004-12-17 04:39:04 charles Exp $";
+const char *yaffs_mtdif_c_version =
+    "$Id: yaffs_mtdif.c,v 1.13 2005-11-07 07:13:33 charles Exp $";
 
-#ifdef CONFIG_YAFFS_MTD_ENABLED
 #include "yportenv.h"
 
+
 #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
 
-struct nand_oobinfo yaffs_oobinfo = {
-       useecc: 1,
-       eccpos: {8, 9, 10, 13, 14, 15}
+static struct nand_oobinfo yaffs_oobinfo = {
+       .useecc = 1,
+       .eccbytes = 6,
+       .eccpos = {8, 9, 10, 13, 14, 15}
 };
 
-struct nand_oobinfo yaffs_noeccinfo = {
-       useecc: 0,
+static struct nand_oobinfo yaffs_noeccinfo = {
+       .useecc = 0,
 };
 
-
-int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, yaffs_Spare *spare)
+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);
+       int retval = 0;
+
+       loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
+
+       __u8 *spareAsBytes = (__u8 *) spare;
+
+       if (data && spare) {
+               if (dev->useNANDECC)
+                       retval =
+                           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);
+                       retval =
+                           mtd->write_ecc(mtd, addr, dev->nBytesPerChunk,
+                                          &dummy, data, spareAsBytes,
+                                          &yaffs_noeccinfo);
+       } else {
+               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);
        }
-       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;
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+               return YAFFS_FAIL;
 }
 
-int nandmtd_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Spare *spare)
+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);
+       int retval = 0;
+
+       loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
+
+       __u8 *spareAsBytes = (__u8 *) spare;
+
+       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 {
+               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);
        }
-       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);
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+               return YAFFS_FAIL;
 }
-#endif
-
 
-int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
+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;
+       __u32 addr =
+           ((loff_t) blockNumber) * dev->nBytesPerChunk
+               * dev->nChunksPerBlock;
        struct erase_info ei;
-    int retval = 0;
-       
+       int retval = 0;
+
        ei.mtd = mtd;
        ei.addr = addr;
        ei.len = dev->nBytesPerChunk * dev->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);
-
-       retval = mtd->erase(mtd,&ei);   
-       
-       //No need for callback 
-       // down(&dev->sem); // Wait for the erasure to complete
-
-    if (retval == 0)   
-       return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
+       ei.priv = (u_long) dev;
+
+       /* Todo finish off the ei if required */
+
+       sema_init(&dev->sem, 0);
+
+       retval = mtd->erase(mtd, &ei);
+
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+               return YAFFS_FAIL;
 }
 
-int nandmtd_InitialiseNAND(yaffs_Device *dev)
+int nandmtd_InitialiseNAND(yaffs_Device * dev)
 {
        return YAFFS_OK;
 }
 
-#endif // CONFIG_YAFFS_MTD_ENABLED
-