projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Change __uxx types to uxx
[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 f0b7c71e1ce916b40680548b8fb79be58923b199..7028a829a9bc1bedbc85bf58f81087140917c962 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 "yaffsinterface.h"
#include "devextras.h"
#include "yaffs_packedtags2.h"
#include "devextras.h"
#include "yaffs_packedtags2.h"
@@
-55,7
+54,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,17
+190,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(yaffs_
dev_t *dev,int nand_chunk,const u8 *data, const 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
+220,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((yaffs_packed_tags2 *)x,tags, !dev->param.no_tags_ecc
);
}
}
@@
-234,17
+233,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(yaffs_
dev_t *dev,int nand_chunk, u8 *data, 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
+256,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_unpack_tags2(tags,(yaffs_
PackedTags2 *)x, !dev->param.noTagsECC
);
+ yaffs_unpack_tags2(tags,(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(yaffs_
dev_t *dev,int nand_chunk
)
{
int blk;
int pg;
{
int blk;
int pg;
@@
-272,8
+271,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
+287,7
@@
static int nandemul2k_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
}
}
-int nandemul2k_EraseBlockInNAND(yaffs_
Device
*dev, int blockNumber)
+int nandemul2k_EraseBlockInNAND(yaffs_
dev_t
*dev, int blockNumber)
{
{
@@
-308,48
+307,48
@@
int nandemul2k_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
return YAFFS_OK;
}
return YAFFS_OK;
}
-int nandemul2k_InitialiseNAND(yaffs_
Device
*dev)
+int nandemul2k_InitialiseNAND(yaffs_
dev_t
*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_s *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(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_s *dev, int block_no, yaffs_block_state_t *state, u32 *seq_n
umber)
{
{
- yaffs_
ExtendedT
ags tags;
+ 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;
}