Some fixes and add NOR integrity code

[yaffs2.git] / direct / yaffscfg.c

diff --git a/direct/yaffscfg.c b/direct/yaffscfg.c
index 380a7270aa5b6d0b0597d986ad470be9f55f368e..dd95a7477585d240f41f42b8ed4dd521d9f29e5a 100644 (file)
--- a/direct/yaffscfg.c
+++ b/direct/yaffscfg.c
@@ -44,6 +44,16 @@ __u32 yaffsfs_CurrentTime(void)
        return 0;
 }
 
+void *yaffs_malloc(size_t size)
+{
+       return malloc(size);
+}
+
+void yaffs_free(void *ptr)
+{
+       free(ptr);
+}
+
 void yaffsfs_LocalInitialisation(void)
 {
        // Define locking semaphore.
@@ -83,7 +93,7 @@ int yaffs_StartUp(void)
        // Set up devices
 
        // /ram
-       ramDev.nBytesPerChunk = 512;
+       ramDev.nDataBytesPerChunk = 512;
        ramDev.nChunksPerBlock = 32;
        ramDev.nReservedBlocks = 2; // Set this smaller for RAM
        ramDev.startBlock = 1; // Can't use block 0
@@ -97,7 +107,7 @@ int yaffs_StartUp(void)
        ramDev.initialiseNAND = yramdisk_InitialiseNAND;
 
        // /boot
-       bootDev.nBytesPerChunk = 612;
+       bootDev.nDataBytesPerChunk = 512;
        bootDev.nChunksPerBlock = 32;
        bootDev.nReservedBlocks = 5;
        bootDev.startBlock = 1; // Can't use block 0
@@ -111,7 +121,7 @@ int yaffs_StartUp(void)
        bootDev.initialiseNAND = yflash_InitialiseNAND;
 
                // /flash
-       flashDev.nBytesPerChunk =  512;
+       flashDev.nDataBytesPerChunk =  512;
        flashDev.nChunksPerBlock = 32;
        flashDev.nReservedBlocks = 5;
        flashDev.startBlock = 128; // First block after 2MB