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 4667142ceee1699d49f0992c84b8942ab78aaea1..06e41e54d2c3282acce8b2fc31543d0f3b9d4913 100644
(file)
--- a/
direct/basic-test/yaffs_fileem2k.c
+++ b/
direct/basic-test/yaffs_fileem2k.c
@@
-24,16
+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 "devextras.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
@@
-66,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;
@@
-180,15
+179,15
@@
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();
if(dev->param.inband_tags){
CheckInit();
if(dev->param.inband_tags){
- yaffs_packed_tags2_tags_only * pt2tp;
- pt2tp = (yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
+
struct
yaffs_packed_tags2_tags_only * pt2tp;
+ pt2tp = (
struct
yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
yaffs_pack_tags2_tags_only(pt2tp,tags);
pos = (nand_chunk % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE;
yaffs_pack_tags2_tags_only(pt2tp,tags);
pos = (nand_chunk % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE;
@@
-260,7
+259,7
@@
int yflash2_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,const
}
else
{
}
else
{
- yaffs_packed_tags2 pt;
+
struct
yaffs_packed_tags2 pt;
yaffs_pack_tags2(&pt,tags, !dev->param.no_tags_ecc);
u8 * ptab = (u8 *)&pt;
yaffs_pack_tags2(&pt,tags, !dev->param.no_tags_ecc);
u8 * ptab = (u8 *)&pt;
@@
-338,7
+337,7
@@
int yflash2_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,const
}
else
{
}
else
{
- yaffs_packed_tags2 pt;
+
struct
yaffs_packed_tags2 pt;
yaffs_pack_tags2(&pt,tags,!dev->param.no_tags_ecc);
u8 * ptab = (u8 *)&pt;
yaffs_pack_tags2(&pt,tags,!dev->param.no_tags_ecc);
u8 * ptab = (u8 *)&pt;
@@
-397,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();
@@
-412,8
+411,8
@@
int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *
}
}
- yaffs_packed_tags2_tags_only * pt2tp;
- pt2tp = (yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
+
struct
yaffs_packed_tags2_tags_only * pt2tp;
+ pt2tp = (
struct
yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
pos = (nand_chunk % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE;
pos = (nand_chunk % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE;
@@
-472,7
+471,7
@@
int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *
}
else
{
}
else
{
- yaffs_packed_tags2 pt;
+
struct
yaffs_packed_tags2 pt;
nread= read(h,&pt,sizeof(pt));
yaffs_unpack_tags2(tags,&pt, !dev->param.no_tags_ecc);
#ifdef SIMULATE_FAILURES
nread= read(h,&pt,sizeof(pt));
yaffs_unpack_tags2(tags,&pt, !dev->param.no_tags_ecc);
#ifdef SIMULATE_FAILURES
@@
-513,7
+512,7
@@
int yflash2_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
int written;
int h;
int written;
int h;
- yaffs_packed_tags2 pt;
+
struct
yaffs_packed_tags2 pt;
CheckInit();
CheckInit();
@@
-580,7
+579,7
@@
int yflash2_InitialiseNAND(struct yaffs_dev *dev)
-int yflash2_QueryNANDBlock(struct yaffs_dev *dev, int block_no,
yaffs_block_state_t
*state, u32 *seq_number)
+int yflash2_QueryNANDBlock(struct yaffs_dev *dev, int block_no,
enum yaffs_block_state
*state, u32 *seq_number)
{
struct yaffs_ext_tags tags;
int chunkNo;
{
struct yaffs_ext_tags tags;
int chunkNo;