X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=direct%2Fyaffscfg2k.c;h=fee61756d4bf4873a7e4db8f8fe8eeead9f26836;hb=3c86d69aed35d33bd7b348fbbf9810419395eacc;hp=e63411ad27f1a94561bf6c99300742bea501f12a;hpb=f67d10d7a5a6d1cc7d1cb6eaada2522873ce5e99;p=yaffs2.git

diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index e63411a..fee6175 100644
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -13,7 +13,19 @@
 
 #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 |
+	YAFFS_TRACE_BAD_BLOCKS |
+//	(~0) |
+	
+	0;
+        
 
 
 void yaffsfs_SetError(int err)
@@ -68,9 +80,9 @@ static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
 #else
 	{ "/", &ramDev},
 	{ "/flash/boot", &bootDev},
-	{ "/flash/", &flashDev},
+	{ "/flash/flash", &flashDev},
 	{ "/ram2k", &ram2kDev},
-	{(void *)0,(void *)0}
+	{(void *)0,(void *)0} /* Null entry to terminate list */
 #endif
 };
 
@@ -84,7 +96,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
@@ -99,7 +111,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
@@ -122,13 +134,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.endBlock = yflash_GetNumberOfBlocks()-1;
+	flashDev.nCheckpointReservedBlocks = 5;
+	//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 = yflash_WriteChunkWithTagsToNAND;
@@ -144,7 +160,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
@@ -167,4 +183,8 @@ int yaffs_StartUp(void)
 
 
 
+void SetCheckpointReservedBlocks(int n)
+{
+	flashDev.nCheckpointReservedBlocks = n;
+}