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

diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index f51c0c4..e63411a 100644
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -13,7 +13,7 @@
 
 #include <errno.h>
 
-unsigned yaffs_traceMask = 0xFFFFFFFF;
+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;
 
 
 void yaffsfs_SetError(int err)
@@ -59,12 +59,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/", &flashDev},
 	{ "/ram2k", &ram2kDev},
 	{(void *)0,(void *)0}
+#endif
 };
 
 
@@ -80,7 +87,7 @@ int yaffs_StartUp(void)
 	ramDev.nBytesPerChunk = 512;
 	ramDev.nChunksPerBlock = 32;
 	ramDev.nReservedBlocks = 2; // Set this smaller for RAM
-	ramDev.startBlock = 1; // Can't use block 0
+	ramDev.startBlock = 0; // Can use block 0
 	ramDev.endBlock = 127; // Last block in 2MB.	
 	//ramDev.useNANDECC = 1;
 	ramDev.nShortOpCaches = 0;	// Disable caching on this device.
@@ -95,7 +102,7 @@ int yaffs_StartUp(void)
 	bootDev.nBytesPerChunk = 512;
 	bootDev.nChunksPerBlock = 32;
 	bootDev.nReservedBlocks = 5;
-	bootDev.startBlock = 1; // Can't use block 0
+	bootDev.startBlock = 0; // Can use block 0
 	bootDev.endBlock = 63; // Last block
 	//bootDev.useNANDECC = 0; // use YAFFS's ECC
 	bootDev.nShortOpCaches = 10; // Use caches
@@ -118,9 +125,9 @@ int yaffs_StartUp(void)
 	flashDev.nBytesPerChunk = 2048;
 	flashDev.nChunksPerBlock = 64;
 	flashDev.nReservedBlocks = 5;
-	flashDev.startBlock = 64; // First block after /boot
+	flashDev.startBlock = 0; 
 	//flashDev.endBlock = 127; // Last block in 16MB
-	flashDev.endBlock = (512 * 1024 * 1024)/(flashDev.nBytesPerChunk * flashDev.nChunksPerBlock) - 1; // Last block in 512MB
+	flashDev.endBlock = yflash_GetNumberOfBlocks()-1;
 	flashDev.isYaffs2 = 1;
 	flashDev.nShortOpCaches = 10; // Use caches
 	flashDev.genericDevice = (void *) 2;	// Used to identify the device in fstat.
@@ -140,7 +147,7 @@ int yaffs_StartUp(void)
 	ram2kDev.nBytesPerChunk = nandemul2k_GetBytesPerChunk();
 	ram2kDev.nChunksPerBlock = nandemul2k_GetChunksPerBlock();
 	ram2kDev.nReservedBlocks = 5;
-	ram2kDev.startBlock = 1; // First block after /boot
+	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;