yaffs New background garbage collector and related tweaks

[yaffs2.git] / direct / yaffscfg2k.c

diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index 0a59d9544426e4586fd3968e61d63b2c3b4dc6f0..92785e1248316d61cd596d348af4a6e2c5ca8ae7 100644 (file)
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -23,6 +23,7 @@
 #include "yaffs_fileem2k.h"
 #include "yaffs_nandemul2k.h"
 #include "yaffs_norif1.h"
+#include "yaffs_trace.h"
 
 #include <errno.h>
 
@@ -34,10 +35,8 @@ unsigned yaffs_traceMask =
        YAFFS_TRACE_ERROR | 
        YAFFS_TRACE_TRACING | 
        YAFFS_TRACE_ALLOCATE | 
-       YAFFS_TRACE_CHECKPOINT |
        YAFFS_TRACE_BAD_BLOCKS |
-
-/*     YAFFS_TRACE_VERIFY |  */
+       YAFFS_TRACE_VERIFY | 
        
        0;
         
@@ -124,7 +123,6 @@ static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
        { "/M18-1", &m18_1Dev},
        { "/yaffs2", &flashDev},
        { "/ram2k", &ram2kDev},
-       { "/flash/bigblock", &flashDev},
        {(void *)0,(void *)0} /* Null entry to terminate list */
 };
 
@@ -138,83 +136,62 @@ int yaffs_StartUp(void)
        // Set up devices
        // /ram1   ram, yaffs1
        memset(&ram1Dev,0,sizeof(ram1Dev));
-       ram1Dev.totalBytesPerChunk = 512;
-       ram1Dev.nChunksPerBlock = 32;
-       ram1Dev.nReservedBlocks = 2; // Set this smaller for RAM
-       ram1Dev.startBlock = 0; // Can use block 0
-       ram1Dev.endBlock = 127; // Last block in 2MB.   
-       //ram1Dev.useNANDECC = 1;
-       ram1Dev.nShortOpCaches = 0;     // Disable caching on this device.
-       ram1Dev.genericDevice = (void *) 0;     // Used to identify the device in fstat.
-       ram1Dev.writeChunkWithTagsToNAND = yramdisk_WriteChunkWithTagsToNAND;
-       ram1Dev.readChunkWithTagsFromNAND = yramdisk_ReadChunkWithTagsFromNAND;
-       ram1Dev.eraseBlockInNAND = yramdisk_EraseBlockInNAND;
-       ram1Dev.initialiseNAND = yramdisk_InitialiseNAND;
+       ram1Dev.param.totalBytesPerChunk = 512;
+       ram1Dev.param.nChunksPerBlock = 32;
+       ram1Dev.param.nReservedBlocks = 2; // Set this smaller for RAM
+       ram1Dev.param.startBlock = 0; // Can use block 0
+       ram1Dev.param.endBlock = 127; // Last block in 2MB.     
+       //ram1Dev.param.useNANDECC = 1;
+       ram1Dev.param.nShortOpCaches = 0;       // Disable caching on this device.
+       ram1Dev.context = (void *) 0;   // Used to identify the device in fstat.
+       ram1Dev.param.writeChunkWithTagsToNAND = yramdisk_WriteChunkWithTagsToNAND;
+       ram1Dev.param.readChunkWithTagsFromNAND = yramdisk_ReadChunkWithTagsFromNAND;
+       ram1Dev.param.eraseBlockInNAND = yramdisk_EraseBlockInNAND;
+       ram1Dev.param.initialiseNAND = yramdisk_InitialiseNAND;
 
        // /M18-1 yaffs1 on M18 nor sim
        memset(&m18_1Dev,0,sizeof(m18_1Dev));
-       m18_1Dev.totalBytesPerChunk = 1024;
-       m18_1Dev.nChunksPerBlock =248;
-       m18_1Dev.nReservedBlocks = 2;
-       m18_1Dev.startBlock = 0; // Can use block 0
-       m18_1Dev.endBlock = 127; // Last block
-       m18_1Dev.useNANDECC = 0; // use YAFFS's ECC
-       m18_1Dev.nShortOpCaches = 10; // Use caches
-       m18_1Dev.genericDevice = (void *) 1;    // Used to identify the device in fstat.
-       m18_1Dev.writeChunkToNAND = ynorif1_WriteChunkToNAND;
-       m18_1Dev.readChunkFromNAND = ynorif1_ReadChunkFromNAND;
-       m18_1Dev.eraseBlockInNAND = ynorif1_EraseBlockInNAND;
-       m18_1Dev.initialiseNAND = ynorif1_InitialiseNAND;
-       m18_1Dev.deinitialiseNAND = ynorif1_DeinitialiseNAND;
-
-
-       // /flash (yaffs2)
+       m18_1Dev.param.totalBytesPerChunk = 1024;
+       m18_1Dev.param.nChunksPerBlock =248;
+       m18_1Dev.param.nReservedBlocks = 2;
+       m18_1Dev.param.startBlock = 0; // Can use block 0
+       m18_1Dev.param.endBlock = 31; // Last block
+       m18_1Dev.param.useNANDECC = 0; // use YAFFS's ECC
+       m18_1Dev.param.nShortOpCaches = 10; // Use caches
+       m18_1Dev.context = (void *) 1;  // Used to identify the device in fstat.
+       m18_1Dev.param.writeChunkToNAND = ynorif1_WriteChunkToNAND;
+       m18_1Dev.param.readChunkFromNAND = ynorif1_ReadChunkFromNAND;
+       m18_1Dev.param.eraseBlockInNAND = ynorif1_EraseBlockInNAND;
+       m18_1Dev.param.initialiseNAND = ynorif1_InitialiseNAND;
+       m18_1Dev.param.deinitialiseNAND = ynorif1_DeinitialiseNAND;
+
+
+       // /yaffs2 
        // Set this puppy up to use
        // the file emulation space as
-       // 2kpage/64chunk per block/128MB device
+       // 2kpage/64chunk per block
+       //
        memset(&flashDev,0,sizeof(flashDev));
 
-       flashDev.totalBytesPerChunk = 512;
-       flashDev.nChunksPerBlock = 64;
-       flashDev.nReservedBlocks = 5;
-       flashDev.inbandTags = 1;
-       //flashDev.checkpointStartBlock = 1;
-       //flashDev.checkpointEndBlock = 20;
-       flashDev.startBlock = 0;
-       flashDev.endBlock = 200; // Make it smaller
-       //flashDev.endBlock = yflash_GetNumberOfBlocks()-1;
-       flashDev.isYaffs2 = 1;
-       flashDev.wideTnodesDisabled=0;
-       flashDev.nShortOpCaches = 10; // Use caches
-       flashDev.genericDevice = (void *) 2;    // Used to identify the device in fstat.
-       flashDev.writeChunkWithTagsToNAND = yflash2_WriteChunkWithTagsToNAND;
-       flashDev.readChunkWithTagsFromNAND = yflash2_ReadChunkWithTagsFromNAND;
-       flashDev.eraseBlockInNAND = yflash2_EraseBlockInNAND;
-       flashDev.initialiseNAND = yflash2_InitialiseNAND;
-       flashDev.markNANDBlockBad = yflash2_MarkNANDBlockBad;
-       flashDev.queryNANDBlock = yflash2_QueryNANDBlock;
-
-       // /ram2k
-       // Set this puppy up to use
-       // the file emulation space as
-       // 2kpage/64chunk per block/128MB device
-       memset(&ram2kDev,0,sizeof(ram2kDev));
-
-       ram2kDev.totalBytesPerChunk = nandemul2k_GetBytesPerChunk();
-       ram2kDev.nChunksPerBlock = nandemul2k_GetChunksPerBlock();
-       ram2kDev.nReservedBlocks = 5;
-       ram2kDev.startBlock = 0; // First block after /boot
-       //ram2kDev.endBlock = 127; // Last block in 16MB
-       ram2kDev.endBlock = nandemul2k_GetNumberOfBlocks() - 1; // Last block in 512MB
-       ram2kDev.isYaffs2 = 1;
-       ram2kDev.nShortOpCaches = 10; // Use caches
-       ram2kDev.genericDevice = (void *) 3;    // Used to identify the device in fstat.
-       ram2kDev.writeChunkWithTagsToNAND = nandemul2k_WriteChunkWithTagsToNAND;
-       ram2kDev.readChunkWithTagsFromNAND = nandemul2k_ReadChunkWithTagsFromNAND;
-       ram2kDev.eraseBlockInNAND = nandemul2k_EraseBlockInNAND;
-       ram2kDev.initialiseNAND = nandemul2k_InitialiseNAND;
-       ram2kDev.markNANDBlockBad = nandemul2k_MarkNANDBlockBad;
-       ram2kDev.queryNANDBlock = nandemul2k_QueryNANDBlock;
+       flashDev.param.totalBytesPerChunk = 2048;
+       flashDev.param.nChunksPerBlock = 64;
+       flashDev.param.nReservedBlocks = 5;
+       flashDev.param.inbandTags = 0;
+       flashDev.param.startBlock = 0;
+       flashDev.param.endBlock = yflash2_GetNumberOfBlocks()-1;
+       flashDev.param.isYaffs2 = 1;
+       flashDev.param.useNANDECC=1;
+       flashDev.param.wideTnodesDisabled=0;
+       flashDev.param.refreshPeriod = 1000;
+       flashDev.param.nShortOpCaches = 10; // Use caches
+       flashDev.context = (void *) 2;  // Used to identify the device in fstat.
+       flashDev.param.writeChunkWithTagsToNAND = yflash2_WriteChunkWithTagsToNAND;
+       flashDev.param.readChunkWithTagsFromNAND = yflash2_ReadChunkWithTagsFromNAND;
+       flashDev.param.eraseBlockInNAND = yflash2_EraseBlockInNAND;
+       flashDev.param.initialiseNAND = yflash2_InitialiseNAND;
+       flashDev.param.markNANDBlockBad = yflash2_MarkNANDBlockBad;
+       flashDev.param.queryNANDBlock = yflash2_QueryNANDBlock;
+
 
        yaffs_initialise(yaffsfs_config);
        
@@ -223,8 +200,3 @@ int yaffs_StartUp(void)
 
 
 
-void SetCheckpointReservedBlocks(int n)
-{
-//     flashDev.nCheckpointReservedBlocks = n;
-}
-