projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Remove a whole lot of function wrappers and forward declarations
[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 b3a8724536fc3066a016bd3cd331bad299572b15..9a857fd116f6554b10790d2c302b052c2877b07b 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;
@@
-137,7
+135,7
@@
static int CheckInit(void)
ned.nBlocks = nBlocks = nandemul2k_CalcNBlocks();
ned.nBlocks = nBlocks = nandemul2k_CalcNBlocks();
- ned.block =
YMALLOC
(sizeof(nandemul_Block*) * nBlocks );
+ ned.block =
malloc
(sizeof(nandemul_Block*) * nBlocks );
if(!ned.block) return YAFFS_FAIL;
if(!ned.block) return YAFFS_FAIL;
@@
-150,7
+148,7
@@
static int CheckInit(void)
nandemul_Block *blk;
nandemul_Block *blk;
- if(!(blk = ned.block[i] =
YMALLOC
(sizeof(nandemul_Block))))
+ if(!(blk = ned.block[i] =
malloc
(sizeof(nandemul_Block))))
{
fail = 1;
}
{
fail = 1;
}
@@
-158,7
+156,7
@@
static int CheckInit(void)
{
for(j = 0; j < PAGES_PER_BLOCK; j++)
{
{
for(j = 0; j < PAGES_PER_BLOCK; j++)
{
- if((blk->page[j] =
YMALLOC
(sizeof(nandemul_Page))) == 0)
+ if((blk->page[j] =
malloc
(sizeof(nandemul_Page))) == 0)
{
fail = 1;
}
{
fail = 1;
}
@@
-175,9
+173,9
@@
static int CheckInit(void)
for(i = 0; i < nAllocated; i++)
{
for(i = 0; i < nAllocated; i++)
{
-
YFREE
(ned.block[i]);
+
kfree
(ned.block[i]);
}
}
-
YFREE
(ned.block);
+
kfree
(ned.block);
T(YAFFS_TRACE_ALWAYS,("Allocation failed, could only allocate %dMB of %dMB requested.\n",
nAllocated/64,sizeInMB));
T(YAFFS_TRACE_ALWAYS,("Allocation failed, could only allocate %dMB of %dMB requested.\n",
nAllocated/64,sizeInMB));
@@
-191,17
+189,17
@@
static int CheckInit(void)
return 1;
}
return 1;
}
-int nandemul2k_WriteChunkWithTagsToNAND(
yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedT
ags *tags)
+int nandemul2k_WriteChunkWithTagsToNAND(
struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struct yaffs_ext_t
ags *tags)
{
int blk;
int pg;
int i;
{
int blk;
int pg;
int i;
-
__
u8 *x;
+ u8 *x;
- blk =
chunkInNAND
/PAGES_PER_BLOCK;
- pg =
chunkInNAND
%PAGES_PER_BLOCK;
+ blk =
nand_chunk
/PAGES_PER_BLOCK;
+ pg =
nand_chunk
%PAGES_PER_BLOCK;
if(data)
if(data)
@@
-221,7
+219,7
@@
int nandemul2k_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
- yaffs_
PackTags2((yaffs_PackedTags2 *)x,tags, !dev->param.noTagsECC
);
+ yaffs_
pack_tags2((struct yaffs_packed_tags2 *)x,tags, !dev->param.no_tags_ecc
);
}
}
@@
-234,17
+232,17
@@
int nandemul2k_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const
}
}
-int nandemul2k_ReadChunkWithTagsFromNAND(
yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedT
ags *tags)
+int nandemul2k_ReadChunkWithTagsFromNAND(
struct yaffs_dev *dev,int nand_chunk, u8 *data, struct yaffs_ext_t
ags *tags)
{
int blk;
int pg;
{
int blk;
int pg;
-
__
u8 *x;
+ u8 *x;
- blk =
chunkInNAND
/PAGES_PER_BLOCK;
- pg =
chunkInNAND
%PAGES_PER_BLOCK;
+ blk =
nand_chunk
/PAGES_PER_BLOCK;
+ pg =
nand_chunk
%PAGES_PER_BLOCK;
if(data)
if(data)
@@
-257,14
+255,14
@@
int nandemul2k_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
- yaffs_
UnpackTags2(tags,(yaffs_PackedTags2 *)x, !dev->param.noTagsECC
);
+ yaffs_
unpack_tags2(tags,(struct yaffs_packed_tags2 *)x, !dev->param.no_tags_ecc
);
}
return YAFFS_OK;
}
}
return YAFFS_OK;
}
-static int nandemul2k_CheckChunkErased(
yaffs_Device *dev,int chunkInNAND
)
+static int nandemul2k_CheckChunkErased(
struct yaffs_dev *dev,int nand_chunk
)
{
int blk;
int pg;
{
int blk;
int pg;
@@
-272,8
+270,8
@@
static int nandemul2k_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
- blk =
chunkInNAND
/PAGES_PER_BLOCK;
- pg =
chunkInNAND
%PAGES_PER_BLOCK;
+ blk =
nand_chunk
/PAGES_PER_BLOCK;
+ pg =
nand_chunk
%PAGES_PER_BLOCK;
for(i = 0; i < PAGE_TOTAL_SIZE; i++)
for(i = 0; i < PAGE_TOTAL_SIZE; i++)
@@
-288,7
+286,7
@@
static int nandemul2k_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
}
}
-int nandemul2k_EraseBlockInNAND(
yaffs_Device
*dev, int blockNumber)
+int nandemul2k_EraseBlockInNAND(
struct yaffs_dev
*dev, int blockNumber)
{
{
@@
-308,48
+306,48
@@
int nandemul2k_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
return YAFFS_OK;
}
return YAFFS_OK;
}
-int nandemul2k_InitialiseNAND(
yaffs_Device
*dev)
+int nandemul2k_InitialiseNAND(
struct yaffs_dev
*dev)
{
CheckInit();
return YAFFS_OK;
}
{
CheckInit();
return YAFFS_OK;
}
-int nandemul2k_MarkNANDBlockBad(struct yaffs_
DeviceStruct *dev, int blockN
o)
+int nandemul2k_MarkNANDBlockBad(struct yaffs_
dev *dev, int block_n
o)
{
{
-
__
u8 *x;
+ u8 *x;
- x = &ned.block[block
N
o]->page[0]->data[PAGE_DATA_SIZE];
+ x = &ned.block[block
_n
o]->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_
DeviceStruct *dev, int blockNo, yaffs_BlockState *state, __u32 *sequenceN
umber)
+int nandemul2k_QueryNANDBlock(struct yaffs_
dev *dev, int block_no, enum yaffs_block_state *state, u32 *seq_n
umber)
{
{
-
yaffs_ExtendedT
ags tags;
+
struct yaffs_ext_t
ags tags;
int chunkNo;
int chunkNo;
- *seq
uenceN
umber = 0;
+ *seq
_n
umber = 0;
- chunkNo = block
No * dev->param.nChunksPerB
lock;
+ chunkNo = block
_no * dev->param.chunks_per_b
lock;
nandemul2k_ReadChunkWithTagsFromNAND(dev,chunkNo,NULL,&tags);
nandemul2k_ReadChunkWithTagsFromNAND(dev,chunkNo,NULL,&tags);
- if(tags.block
B
ad)
+ if(tags.block
_b
ad)
{
*state = YAFFS_BLOCK_STATE_DEAD;
}
{
*state = YAFFS_BLOCK_STATE_DEAD;
}
- else if(!tags.chunk
U
sed)
+ else if(!tags.chunk
_u
sed)
{
*state = YAFFS_BLOCK_STATE_EMPTY;
}
{
*state = YAFFS_BLOCK_STATE_EMPTY;
}
- else if(tags.chunk
U
sed)
+ else if(tags.chunk
_u
sed)
{
*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
{
*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
- *seq
uenceNumber = tags.sequenceN
umber;
+ *seq
_number = tags.seq_n
umber;
}
return YAFFS_OK;
}
}
return YAFFS_OK;
}