*** empty log message ***

[yaffs2.git] / direct / yaffscfg2k.c

diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index 379846b7a99b69da4631fc09ed68c18e71a99c52..2bf5f33218a52720e1ed32f39791a26e70704432 100644 (file)
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -9,10 +9,11 @@
 #include "yaffscfg.h"
 #include "yaffsfs.h"
 #include "yaffs_fileem2k.h"
 #include "yaffscfg.h"
 #include "yaffsfs.h"
 #include "yaffs_fileem2k.h"

+#include "yaffs_nandemul2k.h"

 
 #include <errno.h>
 
 
 #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)
 
 
 void yaffsfs_SetError(int err)


@@ -50,16 +51,19 @@ void yaffsfs_LocalInitialisation(void)
 
 #include "yaffs_ramdisk.h"
 #include "yaffs_flashif.h"
 
 #include "yaffs_ramdisk.h"
 #include "yaffs_flashif.h"

+#include "yaffs_nandemul2k.h"

 
 static yaffs_Device ramDev;
 static yaffs_Device bootDev;
 static yaffs_Device flashDev;
 
 static yaffs_Device ramDev;
 static yaffs_Device bootDev;
 static yaffs_Device flashDev;

+static yaffs_Device ram2kDev;

 
 static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
 
        { "/ram", &ramDev},
        { "/boot", &bootDev},
        { "/flash", &flashDev},
 
 static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
 
        { "/ram", &ramDev},
        { "/boot", &bootDev},
        { "/flash", &flashDev},

+       { "/ram2k", &ram2kDev},

        {(void *)0,(void *)0}
 };
 
        {(void *)0,(void *)0}
 };
 


@@ -116,7 +120,7 @@ int yaffs_StartUp(void)
        flashDev.nReservedBlocks = 5;
        flashDev.startBlock = 64; // First block after /boot
        //flashDev.endBlock = 127; // Last block in 16MB
        flashDev.nReservedBlocks = 5;
        flashDev.startBlock = 64; // First block after /boot
        //flashDev.endBlock = 127; // Last block in 16MB

-       flashDev.endBlock = (512 * 1024 * 1024)/(flashDev.nBytesPerChunk * flashDev.nChunksPerBlock) - 1; // Last block in 512MB
+       flashDev.endBlock = (32 * 1024 * 1024)/(flashDev.nBytesPerChunk * flashDev.nChunksPerBlock) - 1; // Last block in 512MB

        flashDev.isYaffs2 = 1;
        flashDev.nShortOpCaches = 10; // Use caches
        flashDev.genericDevice = (void *) 2;    // Used to identify the device in fstat.
        flashDev.isYaffs2 = 1;
        flashDev.nShortOpCaches = 10; // Use caches
        flashDev.genericDevice = (void *) 2;    // Used to identify the device in fstat.


@@ -127,6 +131,28 @@ int yaffs_StartUp(void)
        flashDev.markNANDBlockBad = yflash_MarkNANDBlockBad;
        flashDev.queryNANDBlock = yflash_QueryNANDBlock;
 
        flashDev.markNANDBlockBad = yflash_MarkNANDBlockBad;
        flashDev.queryNANDBlock = yflash_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.nBytesPerChunk = nandemul2k_GetBytesPerChunk();
+       ram2kDev.nChunksPerBlock = nandemul2k_GetChunksPerBlock();
+       ram2kDev.nReservedBlocks = 5;
+       ram2kDev.startBlock = 1; // 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;
+

        yaffs_initialise(yaffsfs_config);
        
        return 0;
        yaffs_initialise(yaffsfs_config);
        
        return 0;