Add block refreshing feature

[yaffs2.git] / direct / yaffscfg2k.c

diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index 77cbbdf1f22088c097a7a8534cb85de8ea7d6db0..3c0341c5cd35bad700cceb4853367292f0399ef1 100644 (file)
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -1,6 +1,18 @@
 /*
 /*

- * YAFFS: Yet another FFS. A NAND-flash specific file system.
- * yaffscfg.c  The configuration for the "direct" use of yaffs.
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2007 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * yaffscfg2k.c  The configuration for the "direct" use of yaffs.

  *
  * This file is intended to be modified to your requirements.
  * There is no need to redistribute this file.
  *
  * This file is intended to be modified to your requirements.
  * There is no need to redistribute this file.


@@ -10,16 +22,37 @@
 #include "yaffsfs.h"
 #include "yaffs_fileem2k.h"
 #include "yaffs_nandemul2k.h"
 #include "yaffsfs.h"
 #include "yaffs_fileem2k.h"
 #include "yaffs_nandemul2k.h"

+#include "yaffs_norif1.h"
+#include "yaffs_trace.h"

 
 #include <errno.h>
 
 
 #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 | YAFFS_TRACE_CHECKPOINT;
+unsigned yaffs_traceMask = 

 
 

+       YAFFS_TRACE_SCAN |  
+       YAFFS_TRACE_GC |
+       YAFFS_TRACE_ERASE | 
+       YAFFS_TRACE_ERROR | 
+       YAFFS_TRACE_TRACING | 
+       YAFFS_TRACE_ALLOCATE | 
+       YAFFS_TRACE_BAD_BLOCKS |
+       YAFFS_TRACE_VERIFY | 
+       
+       0;
+        
+
+static int yaffsfs_lastError;

 
 void yaffsfs_SetError(int err)
 {
        //Do whatever to set error
 
 void yaffsfs_SetError(int err)
 {
        //Do whatever to set error

-       errno = err;
+       yaffsfs_lastError = err;
+}
+
+
+int yaffsfs_GetLastError(void)
+{
+       return yaffsfs_lastError;

 }
 
 void yaffsfs_Lock(void)
 }
 
 void yaffsfs_Lock(void)


@@ -35,6 +68,30 @@ __u32 yaffsfs_CurrentTime(void)
        return 0;
 }
 
        return 0;
 }
 

+
+static int yaffs_kill_alloc = 0;
+static size_t total_malloced = 0;
+static size_t malloc_limit = 0 & 6000000;
+
+void *yaffs_malloc(size_t size)
+{
+       void * this;
+       if(yaffs_kill_alloc)
+               return NULL;
+       if(malloc_limit && malloc_limit <(total_malloced + size) )
+               return NULL;
+
+       this = malloc(size);
+       if(this)
+               total_malloced += size;
+       return this;
+}
+
+void yaffs_free(void *ptr)
+{
+       free(ptr);
+}
+

 void yaffsfs_LocalInitialisation(void)
 {
        // Define locking semaphore.
 void yaffsfs_LocalInitialisation(void)
 {
        // Define locking semaphore.


@@ -51,27 +108,22 @@ void yaffsfs_LocalInitialisation(void)
 
 #include "yaffs_ramdisk.h"
 #include "yaffs_flashif.h"
 
 #include "yaffs_ramdisk.h"
 #include "yaffs_flashif.h"

+#include "yaffs_flashif2.h"

 #include "yaffs_nandemul2k.h"
 
 #include "yaffs_nandemul2k.h"
 

-static yaffs_Device ramDev;
-static yaffs_Device bootDev;
+static yaffs_Device ram1Dev;
+static yaffs_Device nand2;

 static yaffs_Device flashDev;
 static yaffs_Device ram2kDev;
 static yaffs_Device flashDev;
 static yaffs_Device ram2kDev;

+static yaffs_Device m18_1Dev;

 
 static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
 
 static yaffsfs_DeviceConfiguration yaffsfs_config[] = {

-#if 0
-       { "/ram", &ramDev},
-       { "/boot", &bootDev},
-       { "/flash/", &flashDev},
-       { "/ram2k", &ram2kDev},
-       {(void *)0,(void *)0}
-#else
-       { "/", &ramDev},
-       { "/flash/boot", &bootDev},
-       { "/flash/flash", &flashDev},
+
+       { "/ram1", &ram1Dev},
+       { "/M18-1", &m18_1Dev},
+       { "/yaffs2", &flashDev},

        { "/ram2k", &ram2kDev},
        {(void *)0,(void *)0} /* Null entry to terminate list */
        { "/ram2k", &ram2kDev},
        {(void *)0,(void *)0} /* Null entry to terminate list */

-#endif

 };
 
 
 };
 
 


@@ -82,87 +134,64 @@ int yaffs_StartUp(void)
        yaffsfs_LocalInitialisation();
        
        // Set up devices
        yaffsfs_LocalInitialisation();
        
        // Set up devices

-       // /ram
-       memset(&ramDev,0,sizeof(ramDev));
-       ramDev.nBytesPerChunk = 512;
-       ramDev.nChunksPerBlock = 32;
-       ramDev.nReservedBlocks = 2; // Set this smaller for RAM
-       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.
-       ramDev.genericDevice = (void *) 0;      // Used to identify the device in fstat.
-       ramDev.writeChunkWithTagsToNAND = yramdisk_WriteChunkWithTagsToNAND;
-       ramDev.readChunkWithTagsFromNAND = yramdisk_ReadChunkWithTagsFromNAND;
-       ramDev.eraseBlockInNAND = yramdisk_EraseBlockInNAND;
-       ramDev.initialiseNAND = yramdisk_InitialiseNAND;
-
-       // /boot
-       memset(&bootDev,0,sizeof(bootDev));
-       bootDev.nBytesPerChunk = 512;
-       bootDev.nChunksPerBlock = 32;
-       bootDev.nReservedBlocks = 5;
-       bootDev.startBlock = 0; // Can use block 0
-       bootDev.endBlock = 63; // Last block
-       //bootDev.useNANDECC = 0; // use YAFFS's ECC
-       bootDev.nShortOpCaches = 10; // Use caches
-       bootDev.genericDevice = (void *) 1;     // Used to identify the device in fstat.
-       bootDev.writeChunkWithTagsToNAND = yflash_WriteChunkWithTagsToNAND;
-       bootDev.readChunkWithTagsFromNAND = yflash_ReadChunkWithTagsFromNAND;
-       bootDev.eraseBlockInNAND = yflash_EraseBlockInNAND;
-       bootDev.initialiseNAND = yflash_InitialiseNAND;
-       bootDev.markNANDBlockBad = yflash_MarkNANDBlockBad;
-       bootDev.queryNANDBlock = yflash_QueryNANDBlock;
-
-
-
-       // /flash
+       // /ram1   ram, yaffs1
+       memset(&ram1Dev,0,sizeof(ram1Dev));
+       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.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
        // 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));
 
        memset(&flashDev,0,sizeof(flashDev));
 

-       flashDev.nBytesPerChunk = 2048;
-       flashDev.nChunksPerBlock = 64;
-       flashDev.nReservedBlocks = 5;
-       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;
-       flashDev.readChunkWithTagsFromNAND = yflash_ReadChunkWithTagsFromNAND;
-       flashDev.eraseBlockInNAND = yflash_EraseBlockInNAND;
-       flashDev.initialiseNAND = yflash_InitialiseNAND;
-       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 = 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 = 10000;
+       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);
        
 
        yaffs_initialise(yaffsfs_config);
        


@@ -171,4 +200,3 @@ int yaffs_StartUp(void)
 
 
 
 
 
 

-