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 44a1e874a0eff879f9b443fcaf19d41e7e569b1f..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;
@@
-171,7
+170,7
@@
int yflash2_GetNumberOfBlocks(void)
return filedisk.nBlocks;
}
return filedisk.nBlocks;
}
-int yflash2_WriteChunkWithTagsToNAND(
yaffs_dev_t *dev,int nand_chunk,const u8 *data, cons
t yaffs_ext_tags *tags)
+int yflash2_WriteChunkWithTagsToNAND(
struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struc
t yaffs_ext_tags *tags)
{
int written;
int pos;
{
int written;
int pos;
@@
-180,15
+179,15
@@
int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const u8 *d
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;
@@
-255,12
+254,12
@@
int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const u8 *d
if( 0 && dev->param.is_yaffs2)
{
if( 0 && dev->param.is_yaffs2)
{
- written = write(h,tags,sizeof(yaffs_ext_tags));
- if(written != sizeof(yaffs_ext_tags)) return YAFFS_FAIL;
+ written = write(h,tags,sizeof(
struct
yaffs_ext_tags));
+ if(written != sizeof(
struct
yaffs_ext_tags)) return YAFFS_FAIL;
}
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;
@@
-333,12
+332,12
@@
int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const u8 *d
if( 0 && dev->param.is_yaffs2)
{
if( 0 && dev->param.is_yaffs2)
{
- written = write(h,tags,sizeof(yaffs_ext_tags));
- if(written != sizeof(yaffs_ext_tags)) return YAFFS_FAIL;
+ written = write(h,tags,sizeof(
struct
yaffs_ext_tags));
+ if(written != sizeof(
struct
yaffs_ext_tags)) return YAFFS_FAIL;
}
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;
@@
-388,7
+387,7
@@
static int fail320 = 1;
static int failRead10 = 2;
static int failRead10 = 2;
-int yflash2_ReadChunkWithTagsFromNAND(
yaffs_dev_t *dev,int nand_chunk, u8 *data,
yaffs_ext_tags *tags)
+int yflash2_ReadChunkWithTagsFromNAND(
struct yaffs_dev *dev,int nand_chunk, u8 *data, struct
yaffs_ext_tags *tags)
{
int nread;
int pos;
{
int nread;
int pos;
@@
-397,7
+396,7
@@
int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, u8 *data,
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(yaffs_dev_t *dev,int nand_chunk, u8 *data,
}
}
- 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;
@@
-458,10
+457,10
@@
int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, u8 *data,
if(0 && dev->param.is_yaffs2)
{
if(0 && dev->param.is_yaffs2)
{
- nread= read(h,tags,sizeof(yaffs_ext_tags));
- if(nread != sizeof(yaffs_ext_tags))
+ nread= read(h,tags,sizeof(
struct
yaffs_ext_tags));
+ if(nread != sizeof(
struct
yaffs_ext_tags))
retval = YAFFS_FAIL;
retval = YAFFS_FAIL;
- if(yaffs_check_all_ff((u8 *)tags,sizeof(yaffs_ext_tags)))
+ if(yaffs_check_all_ff((u8 *)tags,sizeof(
struct
yaffs_ext_tags)))
{
yaffs_init_tags(tags);
}
{
yaffs_init_tags(tags);
}
@@
-472,7
+471,7
@@
int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, u8 *data,
}
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
@@
-508,12
+507,12
@@
int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, u8 *data,
}
}
-int yflash2_MarkNANDBlockBad(struct yaffs_dev
_s
*dev, int block_no)
+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();
@@
-529,7
+528,7
@@
int yflash2_MarkNANDBlockBad(struct yaffs_dev_s *dev, int block_no)
}
}
-int yflash2_EraseBlockInNAND(
yaffs_dev_t
*dev, int blockNumber)
+int yflash2_EraseBlockInNAND(
struct yaffs_dev
*dev, int blockNumber)
{
int i;
{
int i;
@@
-570,7
+569,7
@@
int yflash2_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber)
}
}
-int yflash2_InitialiseNAND(
yaffs_dev_t
*dev)
+int yflash2_InitialiseNAND(
struct yaffs_dev
*dev)
{
CheckInit();
{
CheckInit();
@@
-580,9
+579,9
@@
int yflash2_InitialiseNAND(yaffs_dev_t *dev)
-int yflash2_QueryNANDBlock(struct yaffs_dev
_s *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)
{
{
- yaffs_ext_tags tags;
+
struct
yaffs_ext_tags tags;
int chunkNo;
*seq_number = 0;
int chunkNo;
*seq_number = 0;