projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
[yaffs2.git]
/
direct
/
basic-test
/
yaffs_fileem2k.c
diff --git
a/direct/basic-test/yaffs_fileem2k.c
b/direct/basic-test/yaffs_fileem2k.c
index d8fde7382730e713e5496c5821e43e4ebf86e33c..06e41e54d2c3282acce8b2fc31543d0f3b9d4913 100644
(file)
--- a/
direct/basic-test/yaffs_fileem2k.c
+++ b/
direct/basic-test/yaffs_fileem2k.c
@@
-24,15
+24,16
@@
const char *yaffs_flashif2_c_version = "$Id: yaffs_fileem2k.c,v 1.24 2010-02-18
#include "yaffs_flashif2.h"
#include "yaffs_guts.h"
#include "yaffs_flashif2.h"
#include "yaffs_guts.h"
+#include "yaffs_fileem2k.h"
+#include "yaffs_packedtags2.h"
+#include "yaffs_tagsvalidity.h"
+
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include "yaffs_fileem2k.h"
-#include "yaffs_packedtags2.h"
-
#define REPORT_ERROR 0
#define REPORT_ERROR 0
@@
-65,7
+66,6
@@
int yaffs_test_partial_write = 0;
extern int random_seed;
extern int simulate_power_failure;
extern int random_seed;
extern int simulate_power_failure;
-static int initialised = 0;
static int remaining_ops;
static int nops_so_far;
static int remaining_ops;
static int nops_so_far;
@@
-179,7
+179,7
@@
int yflash2_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,const
int nRead;
int error;
int nRead;
int error;
- T(YAFFS_TRACE_MTD,(TSTR("write chunk %d data %
x tags %x" TENDSTR),nand_chunk,(unsigned)data, (unsigned)
tags));
+ T(YAFFS_TRACE_MTD,(TSTR("write chunk %d data %
p tags %p" TENDSTR),nand_chunk, data,
tags));
CheckInit();
CheckInit();
@@
-396,7
+396,7
@@
int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *
int retval = YAFFS_OK;
int nRead;
int retval = YAFFS_OK;
int nRead;
- T(YAFFS_TRACE_MTD,(TSTR("read chunk %d data %
x tags %x" TENDSTR),nand_chunk,(unsigned)data, (unsigned)
tags));
+ T(YAFFS_TRACE_MTD,(TSTR("read chunk %d data %
p tags %p" TENDSTR),nand_chunk, data,
tags));
CheckInit();
CheckInit();