projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs Added more tests to direct/timothy_tests/quick_tests
[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 9bf673ad8ba023c7d685d7979562eb7dc6173915..7f88b7c94a5ec018506a4812352a0dedfcffab86 100644
(file)
--- a/
direct/basic-test/yaffs_ramem2k.c
+++ b/
direct/basic-test/yaffs_ramem2k.c
@@
-31,8
+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 "yaffsinterface.h"
-#include "devextras.h"
#include "yaffs_packedtags2.h"
#include "yaffs_packedtags2.h"
@@
-55,7
+53,7
@@
const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.8 2010-02-18 01:
typedef struct
{
typedef struct
{
-
__
u8 data[PAGE_TOTAL_SIZE]; // Data + spare
+ u8 data[PAGE_TOTAL_SIZE]; // Data + spare
int empty; // is this empty?
} nandemul_Page;
int empty; // is this empty?
} nandemul_Page;
@@
-191,13
+189,13
@@
static int CheckInit(void)
return 1;
}
return 1;
}
-int nandemul2k_WriteChunkWithTagsToNAND(
yaffs_dev_t *dev,int nand_chunk,const __u8 *data, cons
t yaffs_ext_tags *tags)
+int nandemul2k_WriteChunkWithTagsToNAND(
struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struc
t yaffs_ext_tags *tags)
{
int blk;
int pg;
int i;
{
int blk;
int pg;
int i;
-
__
u8 *x;
+ u8 *x;
blk = nand_chunk/PAGES_PER_BLOCK;
blk = nand_chunk/PAGES_PER_BLOCK;
@@
-221,7
+219,7
@@
int nandemul2k_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const __
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
- yaffs_
PackTags2((yaffs_PackedT
ags2 *)x,tags, !dev->param.no_tags_ecc);
+ yaffs_
pack_tags2((struct yaffs_packed_t
ags2 *)x,tags, !dev->param.no_tags_ecc);
}
}
@@
-234,12
+232,12
@@
int nandemul2k_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const __
}
}
-int nandemul2k_ReadChunkWithTagsFromNAND(
yaffs_dev_t *dev,int nand_chunk, __u8 *data,
yaffs_ext_tags *tags)
+int nandemul2k_ReadChunkWithTagsFromNAND(
struct yaffs_dev *dev,int nand_chunk, u8 *data, struct
yaffs_ext_tags *tags)
{
int blk;
int pg;
{
int blk;
int pg;
-
__
u8 *x;
+ u8 *x;
@@
-257,14
+255,14
@@
int nandemul2k_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, __u8 *
{
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_PackedT
ags2 *)x, !dev->param.no_tags_ecc);
+ yaffs_unpack_tags2(tags,(
struct yaffs_packed_t
ags2 *)x, !dev->param.no_tags_ecc);
}
return YAFFS_OK;
}
}
return YAFFS_OK;
}
-static int nandemul2k_CheckChunkErased(
yaffs_dev_t
*dev,int nand_chunk)
+static int nandemul2k_CheckChunkErased(
struct yaffs_dev
*dev,int nand_chunk)
{
int blk;
int pg;
{
int blk;
int pg;
@@
-288,7
+286,7
@@
static int nandemul2k_CheckChunkErased(yaffs_dev_t *dev,int nand_chunk)
}
}
-int nandemul2k_EraseBlockInNAND(
yaffs_dev_t
*dev, int blockNumber)
+int nandemul2k_EraseBlockInNAND(
struct yaffs_dev
*dev, int blockNumber)
{
{
@@
-308,29
+306,29
@@
int nandemul2k_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber)
return YAFFS_OK;
}
return YAFFS_OK;
}
-int nandemul2k_InitialiseNAND(
yaffs_dev_t
*dev)
+int nandemul2k_InitialiseNAND(
struct yaffs_dev
*dev)
{
CheckInit();
return YAFFS_OK;
}
{
CheckInit();
return YAFFS_OK;
}
-int nandemul2k_MarkNANDBlockBad(struct yaffs_dev
_s
*dev, int block_no)
+int nandemul2k_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
{
{
-
__
u8 *x;
+ u8 *x;
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_PackedT
ags2));
+ memset(x,0,sizeof(
struct yaffs_packed_t
ags2));
return YAFFS_OK;
}
return YAFFS_OK;
}
-int nandemul2k_QueryNANDBlock(struct yaffs_dev
_s *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)
{
{
- yaffs_ext_tags tags;
+
struct
yaffs_ext_tags tags;
int chunkNo;
*seq_number = 0;
int chunkNo;
*seq_number = 0;