Remove obsolete pathDivider field

[yaffs2.git] / yaffs_mtdif2.c

diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c
index 918f8de2b6aa95f6cd8a2fb5e363431fad27ea34..8cbe19f37b2500d3bea737a1c182b600e2abb4e6 100644 (file)
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtdif2.c
@@ -14,10 +14,10 @@
 /* mtd interface for YAFFS2 */
 
 const char *yaffs_mtdif2_c_version =
-       "$Id: yaffs_mtdif2.c,v 1.24 2009-10-14 00:01:57 charles Exp $";
+       "$Id: yaffs_mtdif2.c,v 1.27 2010-02-18 01:18:04 charles Exp $";
 
 #include "yportenv.h"
-
+#include "yaffs_trace.h"
 
 #include "yaffs_mtdif2.h"
 
@@ -27,6 +27,8 @@ const char *yaffs_mtdif2_c_version =
 
 #include "yaffs_packedtags2.h"
 
+#include "yaffs_linux.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.
@@ -35,7 +37,7 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
                                      const __u8 *data,
                                      const yaffs_ExtendedTags *tags)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_DeviceToContext(dev)->mtd;
 #if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
        struct mtd_oob_ops ops;
 #else
@@ -47,8 +49,8 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
 
        yaffs_PackedTags2 pt;
 
-       int packed_tags_size = dev->noTagsECC ? sizeof(pt.t) : sizeof(pt);
-       void * packed_tags_ptr = dev->noTagsECC ? (void *) &pt.t : (void *)&pt;
+       int packed_tags_size = dev->param.noTagsECC ? sizeof(pt.t) : sizeof(pt);
+       void * packed_tags_ptr = dev->param.noTagsECC ? (void *) &pt.t : (void *)&pt;
 
        T(YAFFS_TRACE_MTD,
          (TSTR
@@ -56,7 +58,7 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
            TENDSTR), chunkInNAND, data, tags));
 
 
-       addr  = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
+       addr  = ((loff_t) chunkInNAND) * dev->param.totalBytesPerChunk;
 
        /* For yaffs2 writing there must be both data and tags.
         * If we're using inband tags, then the tags are stuffed into
@@ -64,30 +66,30 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
         */
        if (!data || !tags)
                BUG();
-       else if (dev->inbandTags) {
+       else if (dev->param.inbandTags) {
                yaffs_PackedTags2TagsPart *pt2tp;
                pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk);
                yaffs_PackTags2TagsPart(pt2tp, tags);
        } else
-               yaffs_PackTags2(dev, &pt, tags);
+               yaffs_PackTags2(&pt, tags, !dev->param.noTagsECC);
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
        ops.mode = MTD_OOB_AUTO;
-       ops.ooblen = (dev->inbandTags) ? 0 : packed_tags_size;
-       ops.len = dev->totalBytesPerChunk;
+       ops.ooblen = (dev->param.inbandTags) ? 0 : packed_tags_size;
+       ops.len = dev->param.totalBytesPerChunk;
        ops.ooboffs = 0;
        ops.datbuf = (__u8 *)data;
-       ops.oobbuf = (dev->inbandTags) ? NULL : packed_tags_ptr;
+       ops.oobbuf = (dev->param.inbandTags) ? NULL : packed_tags_ptr;
        retval = mtd->write_oob(mtd, addr, &ops);
 
 #else
-       if (!dev->inbandTags) {
+       if (!dev->param.inbandTags) {
                retval =
                    mtd->write_ecc(mtd, addr, dev->nDataBytesPerChunk,
                                   &dummy, data, (__u8 *) packed_tags_ptr, NULL);
        } else {
                retval =
-                   mtd->write(mtd, addr, dev->totalBytesPerChunk, &dummy,
+                   mtd->write(mtd, addr, dev->param.totalBytesPerChunk, &dummy,
                               data);
        }
 #endif
@@ -101,7 +103,7 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
 int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
                                       __u8 *data, yaffs_ExtendedTags *tags)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_DeviceToContext(dev)->mtd;
 #if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
        struct mtd_oob_ops ops;
 #endif
@@ -109,19 +111,19 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
        int retval = 0;
        int localData = 0;
 
-       loff_t addr = ((loff_t) chunkInNAND) * dev->totalBytesPerChunk;
+       loff_t addr = ((loff_t) chunkInNAND) * dev->param.totalBytesPerChunk;
 
        yaffs_PackedTags2 pt;
 
-       int packed_tags_size = dev->noTagsECC ? sizeof(pt.t) : sizeof(pt);
-       void * packed_tags_ptr = dev->noTagsECC ? (void *) &pt.t: (void *)&pt;
+       int packed_tags_size = dev->param.noTagsECC ? sizeof(pt.t) : sizeof(pt);
+       void * packed_tags_ptr = dev->param.noTagsECC ? (void *) &pt.t: (void *)&pt;
 
        T(YAFFS_TRACE_MTD,
          (TSTR
           ("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
            TENDSTR), chunkInNAND, data, tags));
 
-       if (dev->inbandTags) {
+       if (dev->param.inbandTags) {
 
                if (!data) {
                        localData = 1;
@@ -133,8 +135,8 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
 
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-       if (dev->inbandTags || (data && !tags))
-               retval = mtd->read(mtd, addr, dev->totalBytesPerChunk,
+       if (dev->param.inbandTags || (data && !tags))
+               retval = mtd->read(mtd, addr, dev->param.totalBytesPerChunk,
                                &dummy, data);
        else if (tags) {
                ops.mode = MTD_OOB_AUTO;
@@ -142,11 +144,11 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
                ops.len = data ? dev->nDataBytesPerChunk : packed_tags_size;
                ops.ooboffs = 0;
                ops.datbuf = data;
-               ops.oobbuf = dev->spareBuffer;
+               ops.oobbuf = yaffs_DeviceToContext(dev)->spareBuffer;
                retval = mtd->read_oob(mtd, addr, &ops);
        }
 #else
-       if (!dev->inbandTags && data && tags) {
+       if (!dev->param.inbandTags && data && tags) {
 
                retval = mtd->read_ecc(mtd, addr, dev->nDataBytesPerChunk,
                                          &dummy, data, dev->spareBuffer,
@@ -156,7 +158,7 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
                        retval =
                            mtd->read(mtd, addr, dev->nDataBytesPerChunk, &dummy,
                                      data);
-               if (!dev->inbandTags && tags)
+               if (!dev->param.inbandTags && tags)
                        retval =
                            mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
                                          dev->spareBuffer);
@@ -164,7 +166,7 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
 #endif
 
 
-       if (dev->inbandTags) {
+       if (dev->param.inbandTags) {
                if (tags) {
                        yaffs_PackedTags2TagsPart *pt2tp;
                        pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk];
@@ -172,8 +174,8 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
                }
        } else {
                if (tags) {
-                       memcpy(packed_tags_ptr, dev->spareBuffer, packed_tags_size);
-                       yaffs_UnpackTags2(dev, tags, &pt);
+                       memcpy(packed_tags_ptr, yaffs_DeviceToContext(dev)->spareBuffer, packed_tags_size);
+                       yaffs_UnpackTags2(tags, &pt, !dev->param.noTagsECC);
                }
        }
 
@@ -190,15 +192,15 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
 
 int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_DeviceToContext(dev)->mtd;
        int retval;
        T(YAFFS_TRACE_MTD,
          (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), blockNo));
 
        retval =
            mtd->block_markbad(mtd,
-                              blockNo * dev->nChunksPerBlock *
-                              dev->totalBytesPerChunk);
+                              blockNo * dev->param.nChunksPerBlock *
+                              dev->param.totalBytesPerChunk);
 
        if (retval == 0)
                return YAFFS_OK;
@@ -210,15 +212,15 @@ int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
 int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
                            yaffs_BlockState *state, __u32 *sequenceNumber)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
+       struct mtd_info *mtd = yaffs_DeviceToContext(dev)->mtd;
        int retval;
 
        T(YAFFS_TRACE_MTD,
          (TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR), blockNo));
        retval =
            mtd->block_isbad(mtd,
-                            blockNo * dev->nChunksPerBlock *
-                            dev->totalBytesPerChunk);
+                            blockNo * dev->param.nChunksPerBlock *
+                            dev->param.totalBytesPerChunk);
 
        if (retval) {
                T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
@@ -229,7 +231,7 @@ int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
                yaffs_ExtendedTags t;
                nandmtd2_ReadChunkWithTagsFromNAND(dev,
                                                   blockNo *
-                                                  dev->nChunksPerBlock, NULL,
+                                                  dev->param.nChunksPerBlock, NULL,
                                                   &t);
 
                if (t.chunkUsed) {