Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

[yaffs2.git] / yaffs_nand.c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index af4215772482a2b11db0c77ad1885f75180f0712..883a4a788079a6dc8c6b47c2494a2b690e64ef79 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_nand_c_version =
-    "$Id: yaffs_nand.c,v 1.9 2008-05-05 07:58:58 charles Exp $";
+       "$Id: yaffs_nand.c,v 1.13 2010-02-19 01:05:48 charles Exp $";
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
@@ -20,42 +20,47 @@ const char *yaffs_nand_c_version =
 
 #include "yaffs_getblockinfo.h"
 
-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
-                                          __u8 * buffer,
-                                          yaffs_ExtendedTags * tags)
+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
+                                          __u8 *buffer,
+                                          yaffs_ExtendedTags *tags)
 {
        int result;
        yaffs_ExtendedTags localTags;
 
        int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
 
+       dev->nPageReads++;
+
        /* If there are no tags provided, use local tags to get prioritised gc working */
-       if(!tags)
+       if (!tags)
                tags = &localTags;
 
-       if (dev->readChunkWithTagsFromNAND)
-               result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
+       if (dev->param.readChunkWithTagsFromNAND)
+               result = dev->param.readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
                                                      tags);
        else
                result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
                                                                        realignedChunkInNAND,
                                                                        buffer,
                                                                        tags);
-       if(tags &&
-          tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
+       if (tags &&
+          tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
 
-               yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
-                yaffs_HandleChunkError(dev,bi);
+               yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->param.nChunksPerBlock);
+               yaffs_HandleChunkError(dev, bi);
        }
 
        return result;
 }
 
-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
                                                   int chunkInNAND,
-                                                  const __u8 * buffer,
-                                                  yaffs_ExtendedTags * tags)
+                                                  const __u8 *buffer,
+                                                  yaffs_ExtendedTags *tags)
 {
+
+       dev->nPageWrites++;
+
        chunkInNAND -= dev->chunkOffset;
 
 
@@ -75,8 +80,8 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
                YBUG();
        }
 
-       if (dev->writeChunkWithTagsToNAND)
-               return dev->writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
+       if (dev->param.writeChunkWithTagsToNAND)
+               return dev->param.writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
                                                     tags);
        else
                return yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(dev,
@@ -85,26 +90,26 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
                                                                       tags);
 }
 
-int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
 {
        blockNo -= dev->blockOffset;
 
-;
-       if (dev->markNANDBlockBad)
-               return dev->markNANDBlockBad(dev, blockNo);
+
+       if (dev->param.markNANDBlockBad)
+               return dev->param.markNANDBlockBad(dev, blockNo);
        else
                return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
 }
 
-int yaffs_QueryInitialBlockState(yaffs_Device * dev,
+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
                                                 int blockNo,
-                                                yaffs_BlockState * state,
+                                                yaffs_BlockState *state,
                                                 __u32 *sequenceNumber)
 {
        blockNo -= dev->blockOffset;
 
-       if (dev->queryNANDBlock)
-               return dev->queryNANDBlock(dev, blockNo, state, sequenceNumber);
+       if (dev->param.queryNANDBlock)
+               return dev->param.queryNANDBlock(dev, blockNo, state, sequenceNumber);
        else
                return yaffs_TagsCompatabilityQueryNANDBlock(dev, blockNo,
                                                             state,
@@ -119,16 +124,18 @@ int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
 
        blockInNAND -= dev->blockOffset;
 
-
        dev->nBlockErasures++;
-       result = dev->eraseBlockInNAND(dev, blockInNAND);
+
+       result = dev->param.eraseBlockInNAND(dev, blockInNAND);
 
        return result;
 }
 
 int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
 {
-       return dev->initialiseNAND(dev);
+       if(dev->param.initialiseNAND)
+               return dev->param.initialiseNAND(dev);
+       return YAFFS_OK;
 }