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_ramem2k.c
diff --git
a/direct/basic-test/yaffs_ramem2k.c
b/direct/basic-test/yaffs_ramem2k.c
index bbfae31d57c46c8c592a1ee52a1bc1c6117d66b5..7f88b7c94a5ec018506a4812352a0dedfcffab86 100644
(file)
--- a/
direct/basic-test/yaffs_ramem2k.c
+++ b/
direct/basic-test/yaffs_ramem2k.c
@@
-31,7
+31,6
@@
const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.8 2010-02-18 01:
#include "yaffs_nandemul2k.h"
#include "yaffs_guts.h"
#include "yaffs_nandemul2k.h"
#include "yaffs_guts.h"
-#include "devextras.h"
#include "yaffs_packedtags2.h"
#include "yaffs_packedtags2.h"
@@
-220,7
+219,7
@@
int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,con
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
- yaffs_pack_tags2((yaffs_packed_tags2 *)x,tags, !dev->param.no_tags_ecc);
+ yaffs_pack_tags2((
struct
yaffs_packed_tags2 *)x,tags, !dev->param.no_tags_ecc);
}
}
@@
-256,7
+255,7
@@
int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
- yaffs_unpack_tags2(tags,(yaffs_packed_tags2 *)x, !dev->param.no_tags_ecc);
+ yaffs_unpack_tags2(tags,(
struct
yaffs_packed_tags2 *)x, !dev->param.no_tags_ecc);
}
return YAFFS_OK;
}
return YAFFS_OK;
@@
-320,14
+319,14
@@
int nandemul2k_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
x = &ned.block[block_no]->page[0]->data[PAGE_DATA_SIZE];
x = &ned.block[block_no]->page[0]->data[PAGE_DATA_SIZE];
- memset(x,0,sizeof(yaffs_packed_tags2));
+ memset(x,0,sizeof(
struct
yaffs_packed_tags2));
return YAFFS_OK;
}
return YAFFS_OK;
}
-int nandemul2k_QueryNANDBlock(struct yaffs_dev *dev, int block_no,
yaffs_block_state_t
*state, u32 *seq_number)
+int nandemul2k_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;