Fix a couple of mistakes in TRACE/Error messages. Update copyright date.
[yaffs2.git] / yaffs_mtdif2.c
index 9ddf799..d3a6552 100644 (file)
  *
  */
 
-// mtd interface for YAFFS2
+/* mtd interface for YAFFS2 */
 
-const char *yaffs_mtdif2_c_version = "$Id: yaffs_mtdif2.c,v 1.1 2004-12-17 04:39:04 charles Exp $";
+const char *yaffs_mtdif2_c_version =
+    "$Id: yaffs_mtdif2.c,v 1.11 2006-04-25 00:41:43 wookey Exp $";
 
-#ifdef CONFIG_YAFFS_MTD_ENABLED
 #include "yportenv.h"
 
+
 #include "yaffs_mtdif2.h"
 
 #include "linux/mtd/mtd.h"
@@ -29,156 +29,163 @@ const char *yaffs_mtdif2_c_version = "$Id: yaffs_mtdif2.c,v 1.1 2004-12-17 04:39
 
 #include "yaffs_packedtags2.h"
 
-
-
-
-int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags)
+int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
+                                     const __u8 * data,
+                                     const yaffs_ExtendedTags * tags)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
        size_t dummy;
        int retval = 0;
 
-
-       loff_t addr = ((loff_t)chunkInNAND) * dev->nBytesPerChunk;
+       loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
 
        yaffs_PackedTags2 pt;
-       
-       T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %08x tags %08x" TENDSTR),chunkInNAND,data,tags));      
 
-       if(tags)
-       {
-               yaffs_PackTags2(&pt,tags);
+       T(YAFFS_TRACE_MTD,
+         (TSTR
+          ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
+           TENDSTR), chunkInNAND, data, tags));
+
+       if (tags) {
+               yaffs_PackTags2(&pt, tags);
        }
 
-#ifndef        CONFIG_YAFFS_USE_OLD_MTD
-       if(data && tags)
-       {
-               if(dev->useNANDECC)
-                 retval = mtd->write_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,(__u8 *)&pt,NULL);
+       if (data && tags) {
+               if (dev->useNANDECC)
+                       retval =
+                           mtd->write_ecc(mtd, addr, dev->nBytesPerChunk,
+                                          &dummy, data, (__u8 *) & pt, NULL);
                else
-                 retval = mtd->write_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,(__u8 *)&pt,NULL);
-       }
-       else
-       {
-#endif
-       if(data)
-               retval = mtd->write(mtd,addr,dev->nBytesPerChunk,&dummy,data);
-       if(tags)
-               retval = mtd->write_oob(mtd,addr,mtd->oobsize,&dummy,(__u8 *)&pt);
-               
-#ifndef        CONFIG_YAFFS_USE_OLD_MTD
+                       retval =
+                           mtd->write_ecc(mtd, addr, dev->nBytesPerChunk,
+                                          &dummy, data, (__u8 *) & pt, NULL);
+       } else {
+               if (data)
+                       retval =
+                           mtd->write(mtd, addr, dev->nBytesPerChunk, &dummy,
+                                      data);
+               if (tags)
+                       retval =
+                           mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
+                                          (__u8 *) & pt);
+
        }
-#endif
 
-    if (retval == 0)
-       return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+               return YAFFS_FAIL;
 }
 
-int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags)
+int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
+                                      __u8 * data, yaffs_ExtendedTags * tags)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
        size_t dummy;
-        int retval = 0;
-       
+       int retval = 0;
 
-       loff_t addr = ((loff_t)chunkInNAND) * dev->nBytesPerChunk;
-       
-       yaffs_PackedTags2 pt;
+       loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
 
-       T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_ReadChunkWithTagsToNAND chunk %d data %08x tags %08x" TENDSTR),chunkInNAND,data,tags));       
+       yaffs_PackedTags2 pt;
 
-#ifndef        CONFIG_YAFFS_USE_OLD_MTD
-       if(data && tags)
-       {
-               if(dev->useNANDECC)
-               {
-                       retval = mtd->read_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,dev->spareBuffer,NULL);            
-               }
-               else
-               {
-                       retval = mtd->read_ecc(mtd,addr,dev->nBytesPerChunk,&dummy,data,dev->spareBuffer,NULL);
+       T(YAFFS_TRACE_MTD,
+         (TSTR
+          ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
+           TENDSTR), chunkInNAND, data, tags));
+
+       if (data && tags) {
+               if (dev->useNANDECC) {
+                       retval =
+                           mtd->read_ecc(mtd, addr, dev->nBytesPerChunk,
+                                         &dummy, data, dev->spareBuffer,
+                                         NULL);
+               } else {
+                       retval =
+                           mtd->read_ecc(mtd, addr, dev->nBytesPerChunk,
+                                         &dummy, data, dev->spareBuffer,
+                                         NULL);
                }
+       } else {
+               if (data)
+                       retval =
+                           mtd->read(mtd, addr, dev->nBytesPerChunk, &dummy,
+                                     data);
+               if (tags)
+                       retval =
+                           mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
+                                         dev->spareBuffer);
        }
+
+       memcpy(&pt, dev->spareBuffer, sizeof(pt));
+
+       if (tags)
+               yaffs_UnpackTags2(tags, &pt);
+
+       if (retval == 0)
+               return YAFFS_OK;
        else
-       {
-#endif
-       if(data)
-               retval = mtd->read(mtd,addr,dev->nBytesPerChunk,&dummy,data);
-       if(tags)
-               retval = mtd->read_oob(mtd,addr,mtd->oobsize,&dummy,dev->spareBuffer);
-#ifndef        CONFIG_YAFFS_USE_OLD_MTD
-       }
-#endif
-
-    memcpy(&pt,dev->spareBuffer,sizeof(pt));
-    
-    if(tags)
-       yaffs_UnpackTags2(tags,&pt);
-    
-    if (retval == 0)
-       return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
+               return YAFFS_FAIL;
 }
 
 int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
        int retval;
-       T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR),blockNo));      
-       
-       
-       retval = mtd->block_markbad(mtd,blockNo);
+       T(YAFFS_TRACE_MTD,
+         (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), blockNo));
+
+       retval =
+           mtd->block_markbad(mtd,
+                              blockNo * dev->nChunksPerBlock *
+                              dev->nBytesPerChunk);
 
-    if (retval == 0)
-       return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+               return YAFFS_FAIL;
 
 }
 
-int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, int *sequenceNumber)
+int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
+                           yaffs_BlockState * state, int *sequenceNumber)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
        int retval;
-       
-       T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR),blockNo));        
-       retval = mtd->block_isbad(mtd,blockNo);
-       
-       if(retval)
-       {
-               T(YAFFS_TRACE_MTD,(TSTR("block is bad" TENDSTR)));
-       
+
+       T(YAFFS_TRACE_MTD,
+         (TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR), blockNo));
+       retval =
+           mtd->block_isbad(mtd,
+                            blockNo * dev->nChunksPerBlock *
+                            dev->nBytesPerChunk);
+
+       if (retval) {
+               T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
+
                *state = YAFFS_BLOCK_STATE_DEAD;
                *sequenceNumber = 0;
-       }
-       else
-       {
+       } else {
                yaffs_ExtendedTags t;
-               nandmtd2_ReadChunkWithTagsFromNAND(dev,blockNo * dev->nChunksPerBlock,NULL, &t);
-               
-               if(t.chunkUsed)
-               {
-                 *sequenceNumber = t.sequenceNumber;
-                 *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-               }
-               else
-               {
-                 *sequenceNumber = 0;
-                 *state = YAFFS_BLOCK_STATE_EMPTY;
+               nandmtd2_ReadChunkWithTagsFromNAND(dev,
+                                                  blockNo *
+                                                  dev->nChunksPerBlock, NULL,
+                                                  &t);
+
+               if (t.chunkUsed) {
+                       *sequenceNumber = t.sequenceNumber;
+                       *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
+               } else {
+                       *sequenceNumber = 0;
+                       *state = YAFFS_BLOCK_STATE_EMPTY;
                }
        }
-               T(YAFFS_TRACE_MTD,(TSTR("block is bad seq %d state %d" TENDSTR), *sequenceNumber,*state));
+       T(YAFFS_TRACE_MTD,
+         (TSTR("block is bad seq %d state %d" TENDSTR), *sequenceNumber,
+          *state));
 
-    if (retval == 0)
-       return YAFFS_OK;
-    else
-        return YAFFS_FAIL;
+       if (retval == 0)
+               return YAFFS_OK;
+       else
+               return YAFFS_FAIL;
 }
 
-#endif
-
-
-