projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some declarations mismatch between the MTD interface and the implementation in...
[yaffs2.git]
/
yaffs_ramem.c
diff --git
a/yaffs_ramem.c
b/yaffs_ramem.c
index 15dbabf06162393b4e03a77400b84637b1a70825..f4166166dea5d1eb187c73d0c90b527426c66a51 100644
(file)
--- 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.
//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.
3 2005-07-29 19:57:38 luc
Exp $";
#ifndef __KERNEL__
#define CONFIG_YAFFS_RAM_ENABLED
#ifndef __KERNEL__
#define CONFIG_YAFFS_RAM_ENABLED
+#else
+#include <linux/config.h>
#endif
#ifdef CONFIG_YAFFS_RAM_ENABLED
#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 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 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)
@@
-178,7
+180,7
@@
static int CheckInit(void)
return 1;
}
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;
{
int blk;
int pg;