projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs Further name changes and file reorganisation
[yaffs2.git]
/
yaffs_mtdif2.c
diff --git
a/yaffs_mtdif2.c
b/yaffs_mtdif2.c
index 2b0a601fb0c828d83e7ce1fe52c9a210efb0e607..1c60a444ca8597c2896f232760aa9913ab01167a 100644
(file)
--- a/
yaffs_mtdif2.c
+++ b/
yaffs_mtdif2.c
@@
-27,14
+27,14
@@
#include "yaffs_linux.h"
/* NB For use with inband tags....
#include "yaffs_linux.h"
/* NB For use with inband tags....
- * We assume that the data buffer is of size total
BytersPerC
hunk so that we can also
+ * We assume that the data buffer is of size total
_bytes_per_c
hunk so that we can also
* use it to load the tags.
*/
* use it to load the tags.
*/
-int nandmtd2_
WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND
,
+int nandmtd2_
write_chunk_tags(yaffs_dev_t *dev, int nand_chunk
,
const __u8 *data,
const __u8 *data,
- const yaffs_
ExtendedT
ags *tags)
+ const yaffs_
ext_t
ags *tags)
{
{
- struct mtd_info *mtd = yaffs_
DeviceToM
td(dev);
+ struct mtd_info *mtd = yaffs_
dev_to_m
td(dev);
#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
struct mtd_oob_ops ops;
#else
#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
struct mtd_oob_ops ops;
#else
@@
-44,18
+44,18
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
loff_t addr;
loff_t addr;
- yaffs_
PackedT
ags2 pt;
+ yaffs_
packed_t
ags2 pt;
- int packed_tags_size = dev->param.no
TagsECC
? sizeof(pt.t) : sizeof(pt);
- void * packed_tags_ptr = dev->param.no
TagsECC
? (void *) &pt.t : (void *)&pt;
+ int packed_tags_size = dev->param.no
_tags_ecc
? sizeof(pt.t) : sizeof(pt);
+ void * packed_tags_ptr = dev->param.no
_tags_ecc
? (void *) &pt.t : (void *)&pt;
T(YAFFS_TRACE_MTD,
(TSTR
T(YAFFS_TRACE_MTD,
(TSTR
- ("nandmtd2_
WriteChunkWithTagsToNAND
chunk %d data %p tags %p"
- TENDSTR),
chunkInNAND
, data, tags));
+ ("nandmtd2_
write_chunk_tags
chunk %d data %p tags %p"
+ TENDSTR),
nand_chunk
, data, tags));
- addr = ((loff_t)
chunkInNAND) * dev->param.totalBytesPerC
hunk;
+ addr = ((loff_t)
nand_chunk) * dev->param.total_bytes_per_c
hunk;
/* For yaffs2 writing there must be both data and tags.
* If we're using inband tags, then the tags are stuffed into
/* For yaffs2 writing there must be both data and tags.
* If we're using inband tags, then the tags are stuffed into
@@
-63,30
+63,30
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
*/
if (!data || !tags)
BUG();
*/
if (!data || !tags)
BUG();
- else if (dev->param.inband
T
ags) {
- yaffs_
PackedTags2TagsPart
*pt2tp;
- pt2tp = (yaffs_
PackedTags2TagsPart *)(data + dev->nDataBytesPerC
hunk);
- yaffs_
PackTags2TagsPart
(pt2tp, tags);
+ else if (dev->param.inband
_t
ags) {
+ yaffs_
packed_tags2_tags_only
*pt2tp;
+ pt2tp = (yaffs_
packed_tags2_tags_only *)(data + dev->data_bytes_per_c
hunk);
+ yaffs_
pack_tags2_tags_only
(pt2tp, tags);
} else
} else
- yaffs_
PackTags2(&pt, tags, !dev->param.noTagsECC
);
+ yaffs_
pack_tags2(&pt, tags, !dev->param.no_tags_ecc
);
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
ops.mode = MTD_OOB_AUTO;
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
ops.mode = MTD_OOB_AUTO;
- ops.ooblen = (dev->param.inband
T
ags) ? 0 : packed_tags_size;
- ops.len = dev->param.total
BytesPerC
hunk;
+ ops.ooblen = (dev->param.inband
_t
ags) ? 0 : packed_tags_size;
+ ops.len = dev->param.total
_bytes_per_c
hunk;
ops.ooboffs = 0;
ops.datbuf = (__u8 *)data;
ops.ooboffs = 0;
ops.datbuf = (__u8 *)data;
- ops.oobbuf = (dev->param.inband
T
ags) ? NULL : packed_tags_ptr;
+ ops.oobbuf = (dev->param.inband
_t
ags) ? NULL : packed_tags_ptr;
retval = mtd->write_oob(mtd, addr, &ops);
#else
retval = mtd->write_oob(mtd, addr, &ops);
#else
- if (!dev->param.inband
T
ags) {
+ if (!dev->param.inband
_t
ags) {
retval =
retval =
- mtd->write_ecc(mtd, addr, dev->
nDataBytesPerC
hunk,
+ mtd->write_ecc(mtd, addr, dev->
data_bytes_per_c
hunk,
&dummy, data, (__u8 *) packed_tags_ptr, NULL);
} else {
retval =
&dummy, data, (__u8 *) packed_tags_ptr, NULL);
} else {
retval =
- mtd->write(mtd, addr, dev->param.total
BytesPerC
hunk, &dummy,
+ mtd->write(mtd, addr, dev->param.total
_bytes_per_c
hunk, &dummy,
data);
}
#endif
data);
}
#endif
@@
-97,34
+97,34
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
-int nandmtd2_
ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND
,
- __u8 *data, yaffs_
ExtendedT
ags *tags)
+int nandmtd2_
read_chunk_tags(yaffs_dev_t *dev, int nand_chunk
,
+ __u8 *data, yaffs_
ext_t
ags *tags)
{
{
- struct mtd_info *mtd = yaffs_
DeviceToM
td(dev);
+ struct mtd_info *mtd = yaffs_
dev_to_m
td(dev);
#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
struct mtd_oob_ops ops;
#endif
size_t dummy;
int retval = 0;
#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
struct mtd_oob_ops ops;
#endif
size_t dummy;
int retval = 0;
- int local
D
ata = 0;
+ int local
_d
ata = 0;
- loff_t addr = ((loff_t)
chunkInNAND) * dev->param.totalBytesPerC
hunk;
+ loff_t addr = ((loff_t)
nand_chunk) * dev->param.total_bytes_per_c
hunk;
- yaffs_
PackedT
ags2 pt;
+ yaffs_
packed_t
ags2 pt;
- int packed_tags_size = dev->param.no
TagsECC
? sizeof(pt.t) : sizeof(pt);
- void * packed_tags_ptr = dev->param.no
TagsECC
? (void *) &pt.t: (void *)&pt;
+ int packed_tags_size = dev->param.no
_tags_ecc
? sizeof(pt.t) : sizeof(pt);
+ void * packed_tags_ptr = dev->param.no
_tags_ecc
? (void *) &pt.t: (void *)&pt;
T(YAFFS_TRACE_MTD,
(TSTR
T(YAFFS_TRACE_MTD,
(TSTR
- ("nandmtd2_
ReadChunkWithTagsFromNAND
chunk %d data %p tags %p"
- TENDSTR),
chunkInNAND
, data, tags));
+ ("nandmtd2_
read_chunk_tags
chunk %d data %p tags %p"
+ TENDSTR),
nand_chunk
, data, tags));
- if (dev->param.inband
T
ags) {
+ if (dev->param.inband
_t
ags) {
if (!data) {
if (!data) {
- local
D
ata = 1;
- data = yaffs_
GetTempB
uffer(dev, __LINE__);
+ local
_d
ata = 1;
+ data = yaffs_
get_temp_b
uffer(dev, __LINE__);
}
}
@@
-132,60
+132,60
@@
int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
- if (dev->param.inband
T
ags || (data && !tags))
- retval = mtd->read(mtd, addr, dev->param.total
BytesPerC
hunk,
+ if (dev->param.inband
_t
ags || (data && !tags))
+ retval = mtd->read(mtd, addr, dev->param.total
_bytes_per_c
hunk,
&dummy, data);
else if (tags) {
ops.mode = MTD_OOB_AUTO;
ops.ooblen = packed_tags_size;
&dummy, data);
else if (tags) {
ops.mode = MTD_OOB_AUTO;
ops.ooblen = packed_tags_size;
- ops.len = data ? dev->
nDataBytesPerC
hunk : packed_tags_size;
+ ops.len = data ? dev->
data_bytes_per_c
hunk : packed_tags_size;
ops.ooboffs = 0;
ops.datbuf = data;
ops.ooboffs = 0;
ops.datbuf = data;
- ops.oobbuf = yaffs_
DeviceToLC(dev)->spareB
uffer;
+ ops.oobbuf = yaffs_
dev_to_lc(dev)->spare_b
uffer;
retval = mtd->read_oob(mtd, addr, &ops);
}
#else
retval = mtd->read_oob(mtd, addr, &ops);
}
#else
- if (!dev->param.inband
T
ags && data && tags) {
+ if (!dev->param.inband
_t
ags && data && tags) {
- retval = mtd->read_ecc(mtd, addr, dev->
nDataBytesPerC
hunk,
- &dummy, data, dev->spare
B
uffer,
+ retval = mtd->read_ecc(mtd, addr, dev->
data_bytes_per_c
hunk,
+ &dummy, data, dev->spare
_b
uffer,
NULL);
} else {
if (data)
retval =
NULL);
} else {
if (data)
retval =
- mtd->read(mtd, addr, dev->
nDataBytesPerC
hunk, &dummy,
+ mtd->read(mtd, addr, dev->
data_bytes_per_c
hunk, &dummy,
data);
data);
- if (!dev->param.inband
T
ags && tags)
+ if (!dev->param.inband
_t
ags && tags)
retval =
mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
retval =
mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
- dev->spare
B
uffer);
+ dev->spare
_b
uffer);
}
#endif
}
#endif
- if (dev->param.inband
T
ags) {
+ if (dev->param.inband
_t
ags) {
if (tags) {
if (tags) {
- yaffs_
PackedTags2TagsPart
*pt2tp;
- pt2tp = (yaffs_
PackedTags2TagsPart *)&data[dev->nDataBytesPerC
hunk];
- yaffs_
UnpackTags2TagsPart
(tags, pt2tp);
+ yaffs_
packed_tags2_tags_only
*pt2tp;
+ pt2tp = (yaffs_
packed_tags2_tags_only *)&data[dev->data_bytes_per_c
hunk];
+ yaffs_
unpack_tags2_tags_only
(tags, pt2tp);
}
} else {
if (tags) {
}
} else {
if (tags) {
- memcpy(packed_tags_ptr, yaffs_
DeviceToLC(dev)->spareB
uffer, packed_tags_size);
- yaffs_
UnpackTags2(tags, &pt, !dev->param.noTagsECC
);
+ memcpy(packed_tags_ptr, yaffs_
dev_to_lc(dev)->spare_b
uffer, packed_tags_size);
+ yaffs_
unpack_tags2(tags, &pt, !dev->param.no_tags_ecc
);
}
}
}
}
- if (local
D
ata)
- yaffs_
ReleaseTempB
uffer(dev, data, __LINE__);
+ if (local
_d
ata)
+ yaffs_
release_temp_b
uffer(dev, data, __LINE__);
- if (tags && retval == -EBADMSG && tags->ecc
R
esult == YAFFS_ECC_RESULT_NO_ERROR) {
- tags->ecc
R
esult = YAFFS_ECC_RESULT_UNFIXED;
- dev->
eccU
nfixed++;
+ if (tags && retval == -EBADMSG && tags->ecc
_r
esult == YAFFS_ECC_RESULT_NO_ERROR) {
+ tags->ecc
_r
esult = YAFFS_ECC_RESULT_UNFIXED;
+ dev->
n_ecc_u
nfixed++;
}
}
- if(tags && retval == -EUCLEAN && tags->ecc
R
esult == YAFFS_ECC_RESULT_NO_ERROR) {
- tags->ecc
R
esult = YAFFS_ECC_RESULT_FIXED;
- dev->
eccF
ixed++;
+ if(tags && retval == -EUCLEAN && tags->ecc
_r
esult == YAFFS_ECC_RESULT_NO_ERROR) {
+ tags->ecc
_r
esult = YAFFS_ECC_RESULT_FIXED;
+ dev->
n_ecc_f
ixed++;
}
if (retval == 0)
return YAFFS_OK;
}
if (retval == 0)
return YAFFS_OK;
@@
-193,17
+193,17
@@
int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
-int nandmtd2_
MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockN
o)
+int nandmtd2_
mark_block_bad(struct yaffs_dev_s *dev, int block_n
o)
{
{
- struct mtd_info *mtd = yaffs_
DeviceToM
td(dev);
+ struct mtd_info *mtd = yaffs_
dev_to_m
td(dev);
int retval;
T(YAFFS_TRACE_MTD,
int retval;
T(YAFFS_TRACE_MTD,
- (TSTR("nandmtd2_
MarkNANDBlockBad %d" TENDSTR), blockN
o));
+ (TSTR("nandmtd2_
mark_block_bad %d" TENDSTR), block_n
o));
retval =
mtd->block_markbad(mtd,
retval =
mtd->block_markbad(mtd,
- block
No * dev->param.nChunksPerB
lock *
- dev->param.total
BytesPerC
hunk);
+ block
_no * dev->param.chunks_per_b
lock *
+ dev->param.total
_bytes_per_c
hunk);
if (retval == 0)
return YAFFS_OK;
if (retval == 0)
return YAFFS_OK;
@@
-212,41
+212,40
@@
int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
}
}
-int nandmtd2_
QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockN
o,
- yaffs_
BlockState *state, __u32 *sequenceN
umber)
+int nandmtd2_
query_block(struct yaffs_dev_s *dev, int block_n
o,
+ yaffs_
block_state_t *state, __u32 *seq_n
umber)
{
{
- struct mtd_info *mtd = yaffs_
DeviceToM
td(dev);
+ struct mtd_info *mtd = yaffs_
dev_to_m
td(dev);
int retval;
T(YAFFS_TRACE_MTD,
int retval;
T(YAFFS_TRACE_MTD,
- (TSTR("nandmtd2_
QueryNANDBlock %d" TENDSTR), blockN
o));
+ (TSTR("nandmtd2_
query_block %d" TENDSTR), block_n
o));
retval =
mtd->block_isbad(mtd,
retval =
mtd->block_isbad(mtd,
- block
No * dev->param.nChunksPerB
lock *
- dev->param.total
BytesPerC
hunk);
+ block
_no * dev->param.chunks_per_b
lock *
+ dev->param.total
_bytes_per_c
hunk);
if (retval) {
T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
*state = YAFFS_BLOCK_STATE_DEAD;
if (retval) {
T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
*state = YAFFS_BLOCK_STATE_DEAD;
- *seq
uenceN
umber = 0;
+ *seq
_n
umber = 0;
} else {
} else {
- yaffs_ExtendedTags t;
- nandmtd2_ReadChunkWithTagsFromNAND(dev,
- blockNo *
- dev->param.nChunksPerBlock, NULL,
+ yaffs_ext_tags t;
+ nandmtd2_read_chunk_tags(dev, block_no *
+ dev->param.chunks_per_block, NULL,
&t);
&t);
- if (t.chunk
U
sed) {
- *seq
uenceNumber = t.sequenceN
umber;
+ if (t.chunk
_u
sed) {
+ *seq
_number = t.seq_n
umber;
*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
} else {
*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
} else {
- *seq
uenceN
umber = 0;
+ *seq
_n
umber = 0;
*state = YAFFS_BLOCK_STATE_EMPTY;
}
}
T(YAFFS_TRACE_MTD,
*state = YAFFS_BLOCK_STATE_EMPTY;
}
}
T(YAFFS_TRACE_MTD,
- (TSTR("block is bad seq %d state %d" TENDSTR), *seq
uenceN
umber,
+ (TSTR("block is bad seq %d state %d" TENDSTR), *seq
_n
umber,
*state));
if (retval == 0)
*state));
if (retval == 0)