projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs Make more symbol changes
[yaffs2.git]
/
yaffs_nand.c
diff --git
a/yaffs_nand.c
b/yaffs_nand.c
index bd1f05806ee56386efa957a1c4031f3eed5a7d3f..d1fe84af8cfd832ca80100c4b8aff62f42ecb439 100644
(file)
--- a/
yaffs_nand.c
+++ b/
yaffs_nand.c
@@
-17,23
+17,23
@@
#include "yaffs_getblockinfo.h"
#include "yaffs_getblockinfo.h"
-int yaffs_rd_chunk_tags_nand(yaffs_
Device *dev, int chunkInNAND
,
+int yaffs_rd_chunk_tags_nand(yaffs_
dev_t *dev, int nand_chunk
,
__u8 *buffer,
__u8 *buffer,
- yaffs_
ExtendedT
ags *tags)
+ yaffs_
ext_t
ags *tags)
{
int result;
{
int result;
- yaffs_
ExtendedT
ags localTags;
+ yaffs_
ext_t
ags localTags;
- int realignedChunkInNAND =
chunkInNAND - dev->chunkO
ffset;
+ int realignedChunkInNAND =
nand_chunk - dev->chunk_o
ffset;
- dev->n
PageR
eads++;
+ dev->n
_page_r
eads++;
/* If there are no tags provided, use local tags to get prioritised gc working */
if (!tags)
tags = &localTags;
/* If there are no tags provided, use local tags to get prioritised gc working */
if (!tags)
tags = &localTags;
- if (dev->param.read
ChunkWithTagsFromNAND
)
- result = dev->param.read
ChunkWithTagsFromNAND
(dev, realignedChunkInNAND, buffer,
+ if (dev->param.read
_chunk_tags_fn
)
+ result = dev->param.read
_chunk_tags_fn
(dev, realignedChunkInNAND, buffer,
tags);
else
result = yaffs_tags_compat_rd(dev,
tags);
else
result = yaffs_tags_compat_rd(dev,
@@
-41,98
+41,98
@@
int yaffs_rd_chunk_tags_nand(yaffs_Device *dev, int chunkInNAND,
buffer,
tags);
if (tags &&
buffer,
tags);
if (tags &&
- tags->ecc
R
esult > YAFFS_ECC_RESULT_NO_ERROR) {
+ tags->ecc
_r
esult > YAFFS_ECC_RESULT_NO_ERROR) {
- yaffs_
BlockInfo
*bi;
- bi = yaffs_get_block_info(dev,
chunkInNAND/dev->param.nChunksPerB
lock);
+ yaffs_
block_info_t
*bi;
+ bi = yaffs_get_block_info(dev,
nand_chunk/dev->param.chunks_per_b
lock);
yaffs_handle_chunk_error(dev, bi);
}
return result;
}
yaffs_handle_chunk_error(dev, bi);
}
return result;
}
-int yaffs_wr_chunk_tags_nand(yaffs_
Device
*dev,
- int
chunkInNAND
,
+int yaffs_wr_chunk_tags_nand(yaffs_
dev_t
*dev,
+ int
nand_chunk
,
const __u8 *buffer,
const __u8 *buffer,
- yaffs_
ExtendedT
ags *tags)
+ yaffs_
ext_t
ags *tags)
{
{
- dev->n
PageW
rites++;
+ dev->n
_page_w
rites++;
-
chunkInNAND -= dev->chunkO
ffset;
+
nand_chunk -= dev->chunk_o
ffset;
if (tags) {
if (tags) {
- tags->seq
uenceNumber = dev->sequenceN
umber;
- tags->chunk
U
sed = 1;
+ tags->seq
_number = dev->seq_n
umber;
+ tags->chunk
_u
sed = 1;
if (!yaffs_validate_tags(tags)) {
T(YAFFS_TRACE_ERROR,
(TSTR("Writing uninitialised tags" TENDSTR)));
YBUG();
}
T(YAFFS_TRACE_WRITE,
if (!yaffs_validate_tags(tags)) {
T(YAFFS_TRACE_ERROR,
(TSTR("Writing uninitialised tags" TENDSTR)));
YBUG();
}
T(YAFFS_TRACE_WRITE,
- (TSTR("Writing chunk %d tags %d %d" TENDSTR),
chunkInNAND
,
- tags->obj
ectId, tags->chunkI
d));
+ (TSTR("Writing chunk %d tags %d %d" TENDSTR),
nand_chunk
,
+ tags->obj
_id, tags->chunk_i
d));
} else {
T(YAFFS_TRACE_ERROR, (TSTR("Writing with no tags" TENDSTR)));
YBUG();
}
} else {
T(YAFFS_TRACE_ERROR, (TSTR("Writing with no tags" TENDSTR)));
YBUG();
}
- if (dev->param.write
ChunkWithTagsToNAND
)
- return dev->param.write
ChunkWithTagsToNAND(dev, chunkInNAND
, buffer,
+ if (dev->param.write
_chunk_tags_fn
)
+ return dev->param.write
_chunk_tags_fn(dev, nand_chunk
, buffer,
tags);
else
return yaffs_tags_compat_wr(dev,
tags);
else
return yaffs_tags_compat_wr(dev,
-
chunkInNAND
,
+
nand_chunk
,
buffer,
tags);
}
buffer,
tags);
}
-int yaffs_mark_bad(yaffs_
Device *dev, int blockN
o)
+int yaffs_mark_bad(yaffs_
dev_t *dev, int block_n
o)
{
{
- block
No -= dev->blockO
ffset;
+ block
_no -= dev->block_o
ffset;
- if (dev->param.
markNANDBlockBad
)
- return dev->param.
markNANDBlockBad(dev, blockN
o);
+ if (dev->param.
bad_block_fn
)
+ return dev->param.
bad_block_fn(dev, block_n
o);
else
else
- return yaffs_tags_compat_mark_bad(dev, block
N
o);
+ return yaffs_tags_compat_mark_bad(dev, block
_n
o);
}
}
-int yaffs_query_init_block_state(yaffs_
Device
*dev,
- int block
N
o,
- yaffs_
BlockState
*state,
- __u32 *seq
uenceN
umber)
+int yaffs_query_init_block_state(yaffs_
dev_t
*dev,
+ int block
_n
o,
+ yaffs_
block_state_t
*state,
+ __u32 *seq
_n
umber)
{
{
- block
No -= dev->blockO
ffset;
+ block
_no -= dev->block_o
ffset;
- if (dev->param.query
NANDBlock
)
- return dev->param.query
NANDBlock(dev, blockNo, state, sequenceN
umber);
+ if (dev->param.query
_block_fn
)
+ return dev->param.query
_block_fn(dev, block_no, state, seq_n
umber);
else
else
- return yaffs_tags_compat_query_block(dev, block
N
o,
+ return yaffs_tags_compat_query_block(dev, block
_n
o,
state,
state,
- seq
uenceN
umber);
+ seq
_n
umber);
}
}
-int yaffs_erase_block(struct yaffs_
DeviceStruct
*dev,
- int
blockInNAND
)
+int yaffs_erase_block(struct yaffs_
dev_s
*dev,
+ int
flash_block
)
{
int result;
{
int result;
-
blockInNAND -= dev->blockO
ffset;
+
flash_block -= dev->block_o
ffset;
- dev->n
BlockE
rasures++;
+ dev->n
_e
rasures++;
- result = dev->param.erase
BlockInNAND(dev, blockInNAND
);
+ result = dev->param.erase
_fn(dev, flash_block
);
return result;
}
return result;
}
-int yaffs_init_nand(struct yaffs_
DeviceStruct
*dev)
+int yaffs_init_nand(struct yaffs_
dev_s
*dev)
{
{
- if(dev->param.initialise
NAND
)
- return dev->param.initialise
NAND
(dev);
+ if(dev->param.initialise
_flash_fn
)
+ return dev->param.initialise
_flash_fn
(dev);
return YAFFS_OK;
}
return YAFFS_OK;
}