Add large NAND support and improve retirement handling

[yaffs2.git] / yaffs_nand.c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 989e8d91c43979220d1128949ed9f94e60e12393..26acf201d76cfd2e6ee09795328b87b45b47d873 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -13,7 +13,7 @@
  */
  
 const char *yaffs_nand_c_version =
-    "$Id: yaffs_nand.c,v 1.2 2006-09-21 08:13:59 charles Exp $";
+    "$Id: yaffs_nand.c,v 1.3 2006-10-03 10:13:03 charles Exp $";
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
@@ -25,8 +25,13 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
                                           yaffs_ExtendedTags * tags)
 {
        int result;
+       yaffs_ExtendedTags localTags;
        
        int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
+       
+       /* If there are no tags provided, use local tags to get prioritised gc working */
+       if(!tags)
+               tags = &localTags;
 
        if (dev->readChunkWithTagsFromNAND)
                result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
@@ -41,6 +46,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
        
                yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
                bi->gcPrioritise = 1;
+               dev->hasPendingPrioritisedGCs = 1;
        }
                                                                
        return result;