Fix compilation on Linux 2.6.26, fix compilation warnings

[yaffs2.git] / yaffs_mtdif2.c

diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c
index 47d74d33439714839500a37ddead8edb4ff1cee0..0b3c921ada0ae99ca9a56883dea4b5d3897a1f0f 100644 (file)
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtdif2.c
@@ -14,7 +14,7 @@
 /* mtd interface for YAFFS2 */
 
 const char *yaffs_mtdif2_c_version =
-    "$Id: yaffs_mtdif2.c,v 1.18 2007-12-12 18:08:15 colin Exp $";
+    "$Id: yaffs_mtdif2.c,v 1.21 2008-07-23 03:35:12 charles Exp $";
 
 #include "yportenv.h"
 
@@ -27,6 +27,10 @@ const char *yaffs_mtdif2_c_version =
 
 #include "yaffs_packedtags2.h"
 
+/* NB For use with inband tags....
+ * We assume that the data buffer is of size totalBytersPerChunk so that we can also
+ * use it to load the tags.
+ */
 int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
                                      const __u8 * data,
                                      const yaffs_ExtendedTags * tags)
@@ -39,7 +43,7 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
 #endif
        int retval = 0;
 
-       loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
+       loff_t addr;
 
        yaffs_PackedTags2 pt;
 
@@ -47,47 +51,42 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
          (TSTR
           ("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
            TENDSTR), chunkInNAND, data, tags));
+           
 
-#if (MTD_VERSION_CODE > MTD_VERSION(2,6,17))
-       if (tags)
-               yaffs_PackTags2(&pt, tags);
+       addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
+       
+       /* For yaffs2 writing there must be both data and tags.
+        * If we're using inband tags, then the tags are stuffed into
+        * the end of the data buffer.
+        */
+       if(!data || !tags)
+               BUG();  
+       else if(dev->inbandTags){
+               yaffs_PackedTags2TagsPart *pt2tp;
+               pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
+               yaffs_PackTags2TagsPart(pt2tp,tags);
+       }
        else
-               BUG(); /* both tags and data should always be present */
-
-       if (data) {
-               ops.mode = MTD_OOB_AUTO;
-               ops.ooblen = sizeof(pt);
-               ops.len = dev->nDataBytesPerChunk;
-               ops.ooboffs = 0;
-               ops.datbuf = (__u8 *)data;
-               ops.oobbuf = (void *)&pt;
-               retval = mtd->write_oob(mtd, addr, &ops);
-       } else
-               BUG(); /* both tags and data should always be present */
-#else
-       if (tags) {
                yaffs_PackTags2(&pt, tags);
-       }
+       
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+       ops.mode = MTD_OOB_AUTO;
+       ops.ooblen = (dev->inbandTags) ? 0 : sizeof(pt);
+       ops.len = dev->totalBytesPerChunk;
+       ops.ooboffs = 0;
+       ops.datbuf = (__u8 *)data;
+       ops.oobbuf = (dev->inbandTags) ? NULL : (void *)&pt;
+       retval = mtd->write_oob(mtd, addr, &ops);
 
-       if (data && tags) {
-               if (dev->useNANDECC)
-                       retval =
-                           mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-                                          &dummy, data, (__u8 *) & pt, NULL);
-               else
-                       retval =
-                           mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
-                                          &dummy, data, (__u8 *) & pt, NULL);
+#else
+       if (!dev->inbandTags) {
+               retval =
+                   mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
+                                  &dummy, data, (__u8 *) & pt, NULL);
        } else {
-               if (data)
-                       retval =
-                           mtd->write(mtd, addr, dev->nDataBytesPerChunk, &dummy,
-                                      data);
-               if (tags)
-                       retval =
-                           mtd->write_oob(mtd, addr, mtd->oobsize, &dummy,
-                                          (__u8 *) & pt);
-
+               retval =
+                   mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
+                              data);
        }
 #endif
 
@@ -106,6 +105,7 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
 #endif
        size_t dummy;
        int retval = 0;
+       int localData = 0;
 
        loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
 
@@ -115,10 +115,21 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
          (TSTR
           ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
            TENDSTR), chunkInNAND, data, tags));
+           
+       if(dev->inbandTags){
+               
+               if(!data) {
+                       localData = 1;
+                       data = yaffs_GetTempBuffer(dev,__LINE__);
+               }
+               
 
-#if (MTD_VERSION_CODE > MTD_VERSION(2,6,17))
-       if (data && !tags)
-               retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
+       }
+
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+       if (dev->inbandTags || (data && !tags))
+               retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
                                &dummy, data);
        else if (tags) {
                ops.mode = MTD_OOB_AUTO;
@@ -130,38 +141,43 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
                retval = mtd->read_oob(mtd, addr, &ops);
        }
 #else
-       if (data && tags) {
-               if (dev->useNANDECC) {
-                       retval =
-                           mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
-                                         &dummy, data, dev->spareBuffer,
-                                         NULL);
-               } else {
-                       retval =
-                           mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
+       if (!dev->inbandTags && data && tags) {
+
+               retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
                                          &dummy, data, dev->spareBuffer,
                                          NULL);
-               }
        } else {
                if (data)
                        retval =
                            mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
                                      data);
-               if (tags)
+               if (!dev->inbandTags && tags)
                        retval =
                            mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
                                          dev->spareBuffer);
        }
 #endif
 
-       memcpy(&pt, dev->spareBuffer, sizeof(pt));
 
-       if (tags)
-               yaffs_UnpackTags2(tags, &pt);
+       if(dev->inbandTags){
+               if(tags){
+                       yaffs_PackedTags2TagsPart * pt2tp;
+                       pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];    
+                       yaffs_UnpackTags2TagsPart(tags,pt2tp);
+               }
+       }
+       else {
+               if (tags){
+                       memcpy(&pt, dev->spareBuffer, sizeof(pt));
+                       yaffs_UnpackTags2(tags, &pt);
+               }
+       }
+
+       if(localData)
+               yaffs_ReleaseTempBuffer(dev,data,__LINE__);
        
        if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-               tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-
+               tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;             
        if (retval == 0)
                return YAFFS_OK;
        else
@@ -188,7 +204,7 @@ int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
 }
 
 int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
-                           yaffs_BlockState * state, int *sequenceNumber)
+                           yaffs_BlockState * state, __u32 *sequenceNumber)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
        int retval;