Tweaks to retirement handling

[yaffs2.git] / direct / yaffscfg2k.c

diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index 9c45524774993f7097c7821faa58057cebc5455b..cb960bcf7796686d90bb8289503b6a9844116e2b 100644 (file)
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -13,7 +13,8 @@
 
 #include <errno.h>
 
-unsigned yaffs_traceMask = YAFFS_TRACE_SCAN |  YAFFS_TRACE_GC | YAFFS_TRACE_GC_DETAIL | YAFFS_TRACE_WRITE | YAFFS_TRACE_ERASE | YAFFS_TRACE_TRACING | YAFFS_TRACE_ALLOCATE;
+unsigned yaffs_traceMask = YAFFS_TRACE_SCAN |  YAFFS_TRACE_GC /*| YAFFS_TRACE_GC_DETAIL | YAFFS_TRACE_WRITE */ | YAFFS_TRACE_ERASE | YAFFS_TRACE_TRACING | YAFFS_TRACE_ALLOCATE | YAFFS_TRACE_CHECKPOINT;
+//unsigned yaffs_traceMask = ~0;
 
 
 void yaffsfs_SetError(int err)
@@ -59,12 +60,19 @@ static yaffs_Device flashDev;
 static yaffs_Device ram2kDev;
 
 static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
-
+#if 0
        { "/ram", &ramDev},
        { "/boot", &bootDev},
-       { "/flash", &flashDev},
+       { "/flash/", &flashDev},
        { "/ram2k", &ram2kDev},
        {(void *)0,(void *)0}
+#else
+       { "/", &ramDev},
+       { "/flash/boot", &bootDev},
+       { "/flash/flash", &flashDev},
+       { "/ram2k", &ram2kDev},
+       {(void *)0,(void *)0} /* Null entry to terminate list */
+#endif
 };
 
 
@@ -77,7 +85,7 @@ int yaffs_StartUp(void)
        // Set up devices
        // /ram
        memset(&ramDev,0,sizeof(ramDev));
-       ramDev.nBytesPerChunk = 512;
+       ramDev.nDataBytesPerChunk = 512;
        ramDev.nChunksPerBlock = 32;
        ramDev.nReservedBlocks = 2; // Set this smaller for RAM
        ramDev.startBlock = 0; // Can use block 0
@@ -92,7 +100,7 @@ int yaffs_StartUp(void)
 
        // /boot
        memset(&bootDev,0,sizeof(bootDev));
-       bootDev.nBytesPerChunk = 512;
+       bootDev.nDataBytesPerChunk = 512;
        bootDev.nChunksPerBlock = 32;
        bootDev.nReservedBlocks = 5;
        bootDev.startBlock = 0; // Can use block 0
@@ -115,13 +123,17 @@ int yaffs_StartUp(void)
        // 2kpage/64chunk per block/128MB device
        memset(&flashDev,0,sizeof(flashDev));
 
-       flashDev.nBytesPerChunk = 2048;
+       flashDev.nDataBytesPerChunk = 2048;
        flashDev.nChunksPerBlock = 64;
        flashDev.nReservedBlocks = 5;
-       flashDev.startBlock = 0; 
-       //flashDev.endBlock = 127; // Last block in 16MB
+       flashDev.nCheckpointReservedBlocks = 5;
+       //flashDev.checkpointStartBlock = 1;
+       //flashDev.checkpointEndBlock = 20;
+       flashDev.startBlock = 20; 
+       //flashDev.endBlock = 127; // 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 = yflash_WriteChunkWithTagsToNAND;
@@ -137,7 +149,7 @@ int yaffs_StartUp(void)
        // 2kpage/64chunk per block/128MB device
        memset(&ram2kDev,0,sizeof(ram2kDev));
 
-       ram2kDev.nBytesPerChunk = nandemul2k_GetBytesPerChunk();
+       ram2kDev.nDataBytesPerChunk = nandemul2k_GetBytesPerChunk();
        ram2kDev.nChunksPerBlock = nandemul2k_GetChunksPerBlock();
        ram2kDev.nReservedBlocks = 5;
        ram2kDev.startBlock = 0; // First block after /boot
@@ -160,4 +172,8 @@ int yaffs_StartUp(void)
 
 
 
+void SetCheckpointReservedBlocks(int n)
+{
+       flashDev.nCheckpointReservedBlocks = n;
+}