X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffscfg.c;h=0d83c654591d9b7b89e9f0e37bba0573ff45db69;hp=380a7270aa5b6d0b0597d986ad470be9f55f368e;hb=4a96d43bb566f00596a31a41c535cabbf52d4f20;hpb=e1ac494e05a5dc7ab61d799af815d103a11d318c

diff --git a/direct/yaffscfg.c b/direct/yaffscfg.c
index 380a727..0d83c65 100644
--- a/direct/yaffscfg.c
+++ b/direct/yaffscfg.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -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