Add some handly Linux test stuff

[yaffs2.git] / yaffs_nand.c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 38989851ed7f24f4267f74a7fccd6af8a1e8327d..0a76ca020d23ef2f59c55740b09e52d7ee259fec 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -12,24 +12,27 @@
  */
 
 const char *yaffs_nand_c_version =
-    "$Id: yaffs_nand.c,v 1.8 2007-12-13 15:35:18 wookey Exp $";
+       "$Id: yaffs_nand.c,v 1.11 2009-09-09 03:03:01 charles Exp $";
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
 #include "yaffs_tagsvalidity.h"
 
+#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)
@@ -40,21 +43,24 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
                                                                        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_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;
 
 
@@ -84,21 +90,21 @@ 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);
        else
                return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
 }
 
-int yaffs_QueryInitialBlockState(yaffs_Device * dev,
+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
                                                 int blockNo,
-                                                yaffs_BlockState * state,
-                                                unsigned *sequenceNumber)
+                                                yaffs_BlockState *state,
+                                                __u32 *sequenceNumber)
 {
        blockNo -= dev->blockOffset;
 
@@ -118,8 +124,8 @@ int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
 
        blockInNAND -= dev->blockOffset;
 
-
        dev->nBlockErasures++;
+
        result = dev->eraseBlockInNAND(dev, blockInNAND);
 
        return result;