X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_ramem.c;h=21c936f1e309c1a286cd4174a82789caeeeb8caa;hp=15dbabf06162393b4e03a77400b84637b1a70825;hb=71735099f6e4f4eb6037852a0590223224f22382;hpb=37fd9ec3587b5c4d497a7682522a9adfab682e51

diff --git a/yaffs_ramem.c b/yaffs_ramem.c
index 15dbabf..21c936f 100644
--- a/yaffs_ramem.c
+++ b/yaffs_ramem.c
@@ -15,10 +15,12 @@
  //yaffs_ramem.c
  // Since this creates the RAM block at start up it is pretty useless for testing the scanner.
 
-const char *yaffs_ramem_c_version = "$Id: yaffs_ramem.c,v 1.1 2004-12-17 04:39:04 charles Exp $";
+const char *yaffs_ramem_c_version = "$Id: yaffs_ramem.c,v 1.4 2005-07-31 04:08:08 marty Exp $";
 
 #ifndef __KERNEL__
 #define CONFIG_YAFFS_RAM_ENABLED
+#else
+#include <linux/config.h>
 #endif
 
 #ifdef CONFIG_YAFFS_RAM_ENABLED
@@ -33,10 +35,10 @@ const char *yaffs_ramem_c_version = "$Id: yaffs_ramem.c,v 1.1 2004-12-17 04:39:0
 
 #define EM_SIZE_IN_MEG 2
 
-#define BLOCK_SIZE (32 * 528)
+#define YAFFS_BLOCK_SIZE (32 * 528)
 #define BLOCKS_PER_MEG ((1024*1024)/(32 * 512))
 #define FILE_SIZE_IN_BLOCKS (FILE_SIZE_IN_MEG * BLOCKS_PER_MEG)
-#define FILE_SIZE_IN_BYTES (FILE_SIZE_IN_BLOCKS * BLOCK_SIZE)
+#define FILE_SIZE_IN_BYTES (FILE_SIZE_IN_BLOCKS * YAFFS_BLOCK_SIZE)
 
 
 
@@ -98,7 +100,7 @@ static void nandemul_ReallyEraseBlock(int blockNumber)
 }
 
 
-int nandemul_CalcNBlocks(void)
+static int nandemul_CalcNBlocks(void)
 {
         switch(sizeInMB)
         {
@@ -178,7 +180,7 @@ static int  CheckInit(void)
 	return 1;
 }
 
-int nandemul_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, yaffs_Spare *spare)
+int nandemul_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_Spare *spare)
 {
 	int blk;
 	int pg;
@@ -257,7 +259,7 @@ int nandemul_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, ya
 }
 
 
-int nandemul_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
+static int nandemul_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
 {
 	int blk;
 	int pg;