projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Enable 64-bit building of python library
[yaffs2.git]
/
yaffs_mtdif2.c
diff --git
a/yaffs_mtdif2.c
b/yaffs_mtdif2.c
index 77504babb78112909b235c1ead8579f233e301c5..c6ebdaa70386df2f2956918b1ea71e3361ac2953 100644
(file)
--- a/
yaffs_mtdif2.c
+++ b/
yaffs_mtdif2.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-20
07
Aleph One Ltd.
+ * Copyright (C) 2002-20
10
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-13,11
+13,8
@@
/* mtd interface for YAFFS2 */
/* mtd interface for YAFFS2 */
-const char *yaffs_mtdif2_c_version =
- "$Id: yaffs_mtdif2.c,v 1.23 2009-03-06 17:20:53 wookey Exp $";
-
#include "yportenv.h"
#include "yportenv.h"
-
+#include "yaffs_trace.h"
#include "yaffs_mtdif2.h"
#include "yaffs_mtdif2.h"
@@
-27,15
+24,17
@@
const char *yaffs_mtdif2_c_version =
#include "yaffs_packedtags2.h"
#include "yaffs_packedtags2.h"
+#include "yaffs_linux.h"
+
/* NB For use with inband tags....
* We assume that the data buffer is of size totalBytersPerChunk so that we can also
* use it to load the tags.
*/
/* NB For use with inband tags....
* We assume that the data buffer is of size totalBytersPerChunk so that we can also
* use it to load the tags.
*/
-int nandmtd2_WriteChunkWithTagsToNAND(yaffs_
Device *dev, int chunkInNAND
,
+int nandmtd2_WriteChunkWithTagsToNAND(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 =
(struct mtd_info *)(dev->genericDevice
);
+ struct mtd_info *mtd =
yaffs_dev_to_mtd(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
@@
-47,13
+46,16
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
yaffs_PackedTags2 pt;
yaffs_PackedTags2 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
("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
T(YAFFS_TRACE_MTD,
(TSTR
("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- TENDSTR),
chunkInNAND
, data, tags));
+ TENDSTR),
nand_chunk
, data, tags));
- addr = ((loff_t)
chunkInNAND) * dev->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
@@
-61,30
+63,30
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND,
*/
if (!data || !tags)
BUG();
*/
if (!data || !tags)
BUG();
- else if (dev->
inbandT
ags) {
+ else if (dev->
param.inband_t
ags) {
yaffs_PackedTags2TagsPart *pt2tp;
yaffs_PackedTags2TagsPart *pt2tp;
- pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->
nDataBytesPerC
hunk);
+ pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->
data_bytes_per_c
hunk);
yaffs_PackTags2TagsPart(pt2tp, tags);
} else
yaffs_PackTags2TagsPart(pt2tp, tags);
} else
- yaffs_PackTags2(&pt, tags);
+ yaffs_PackTags2(&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->
inbandTags) ? 0 : sizeof(pt)
;
- ops.len = dev->
totalBytesPerC
hunk;
+ ops.ooblen = (dev->
param.inband_tags) ? 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->
inbandTags) ? NULL : (void *)&pt
;
+ ops.oobbuf = (dev->
param.inband_tags) ? NULL : packed_tags_ptr
;
retval = mtd->write_oob(mtd, addr, &ops);
#else
retval = mtd->write_oob(mtd, addr, &ops);
#else
- if (!dev->
inbandT
ags) {
+ if (!dev->
param.inband_t
ags) {
retval =
retval =
- mtd->write_ecc(mtd, addr, dev->
nDataBytesPerC
hunk,
- &dummy, data, (__u8 *)
&pt
, NULL);
+ mtd->write_ecc(mtd, addr, dev->
data_bytes_per_c
hunk,
+ &dummy, data, (__u8 *)
packed_tags_ptr
, NULL);
} else {
retval =
} else {
retval =
- mtd->write(mtd, addr, dev->
totalBytesPerC
hunk, &dummy,
+ mtd->write(mtd, addr, dev->
param.total_bytes_per_c
hunk, &dummy,
data);
}
#endif
data);
}
#endif
@@
-95,10
+97,10
@@
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_ReadChunkWithTagsFromNAND(yaffs_
dev_t *dev, int nand_chunk
,
+ __u8 *data, yaffs_
ext_t
ags *tags)
{
{
- struct mtd_info *mtd =
(struct mtd_info *)(dev->genericDevice
);
+ struct mtd_info *mtd =
yaffs_dev_to_mtd(dev
);
#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
struct mtd_oob_ops ops;
#endif
#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
struct mtd_oob_ops ops;
#endif
@@
-106,20
+108,23
@@
int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
int retval = 0;
int localData = 0;
int retval = 0;
int localData = 0;
- loff_t addr = ((loff_t)
chunkInNAND) * dev->totalBytesPerC
hunk;
+ loff_t addr = ((loff_t)
nand_chunk) * dev->param.total_bytes_per_c
hunk;
yaffs_PackedTags2 pt;
yaffs_PackedTags2 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
("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
T(YAFFS_TRACE_MTD,
(TSTR
("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
- TENDSTR),
chunkInNAND
, data, tags));
+ TENDSTR),
nand_chunk
, data, tags));
- if (dev->
inbandT
ags) {
+ if (dev->
param.inband_t
ags) {
if (!data) {
localData = 1;
if (!data) {
localData = 1;
- data = yaffs_
GetTempB
uffer(dev, __LINE__);
+ data = yaffs_
get_temp_b
uffer(dev, __LINE__);
}
}
@@
-127,30
+132,30
@@
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->
inbandT
ags || (data && !tags))
- retval = mtd->read(mtd, addr, dev->
totalBytesPerC
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;
&dummy, data);
else if (tags) {
ops.mode = MTD_OOB_AUTO;
- ops.ooblen =
sizeof(pt)
;
- ops.len = data ? dev->
nDataBytesPerChunk : sizeof(pt)
;
+ ops.ooblen =
packed_tags_size
;
+ ops.len = data ? dev->
data_bytes_per_chunk : packed_tags_size
;
ops.ooboffs = 0;
ops.datbuf = data;
ops.ooboffs = 0;
ops.datbuf = data;
- ops.oobbuf =
dev
->spareBuffer;
+ ops.oobbuf =
yaffs_dev_to_lc(dev)
->spareBuffer;
retval = mtd->read_oob(mtd, addr, &ops);
}
#else
retval = mtd->read_oob(mtd, addr, &ops);
}
#else
- if (!dev->
inbandT
ags && data && tags) {
+ if (!dev->
param.inband_t
ags && data && tags) {
- retval = mtd->read_ecc(mtd, addr, dev->
nDataBytesPerC
hunk,
+ retval = mtd->read_ecc(mtd, addr, dev->
data_bytes_per_c
hunk,
&dummy, data, dev->spareBuffer,
NULL);
} else {
if (data)
retval =
&dummy, data, dev->spareBuffer,
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->
inbandT
ags && tags)
+ if (!dev->
param.inband_t
ags && tags)
retval =
mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
dev->spareBuffer);
retval =
mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
dev->spareBuffer);
@@
-158,41
+163,47
@@
int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
#endif
#endif
- if (dev->
inbandT
ags) {
+ if (dev->
param.inband_t
ags) {
if (tags) {
yaffs_PackedTags2TagsPart *pt2tp;
if (tags) {
yaffs_PackedTags2TagsPart *pt2tp;
- pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->
nDataBytesPerC
hunk];
- yaffs_
UnpackTags2TagsP
art(tags, pt2tp);
+ pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->
data_bytes_per_c
hunk];
+ yaffs_
unpack_tags2tags_p
art(tags, pt2tp);
}
} else {
if (tags) {
}
} else {
if (tags) {
- memcpy(
&pt, dev->spareBuffer, sizeof(pt)
);
- yaffs_
UnpackTags2(tags, &pt
);
+ memcpy(
packed_tags_ptr, yaffs_dev_to_lc(dev)->spareBuffer, packed_tags_size
);
+ yaffs_
unpack_tags2(tags, &pt, !dev->param.no_tags_ecc
);
}
}
if (localData)
}
}
if (localData)
- yaffs_
ReleaseTempB
uffer(dev, data, __LINE__);
+ yaffs_
release_temp_b
uffer(dev, data, __LINE__);
- if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ if (tags && retval == -EBADMSG && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
+ tags->ecc_result = YAFFS_ECC_RESULT_UNFIXED;
+ dev->n_ecc_unfixed++;
+ }
+ if(tags && retval == -EUCLEAN && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
+ tags->ecc_result = YAFFS_ECC_RESULT_FIXED;
+ dev->n_ecc_fixed++;
+ }
if (retval == 0)
return YAFFS_OK;
else
return YAFFS_FAIL;
}
if (retval == 0)
return YAFFS_OK;
else
return YAFFS_FAIL;
}
-int nandmtd2_MarkNANDBlockBad(struct yaffs_
DeviceStruct *dev, int blockN
o)
+int nandmtd2_MarkNANDBlockBad(struct yaffs_
dev_s *dev, int block_n
o)
{
{
- struct mtd_info *mtd =
(struct mtd_info *)(dev->genericDevice
);
+ struct mtd_info *mtd =
yaffs_dev_to_mtd(dev
);
int retval;
T(YAFFS_TRACE_MTD,
int retval;
T(YAFFS_TRACE_MTD,
- (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), block
N
o));
+ (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), block
_n
o));
retval =
mtd->block_markbad(mtd,
retval =
mtd->block_markbad(mtd,
- block
No * dev->nChunksPerB
lock *
- dev->
totalBytesPerC
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;
@@
-201,41
+212,41
@@
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_QueryNANDBlock(struct yaffs_
dev_s *dev, int block_n
o,
+ yaffs_
block_state_t *state, __u32 *seq_n
umber)
{
{
- struct mtd_info *mtd =
(struct mtd_info *)(dev->genericDevice
);
+ struct mtd_info *mtd =
yaffs_dev_to_mtd(dev
);
int retval;
T(YAFFS_TRACE_MTD,
int retval;
T(YAFFS_TRACE_MTD,
- (TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR), block
N
o));
+ (TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR), block
_n
o));
retval =
mtd->block_isbad(mtd,
retval =
mtd->block_isbad(mtd,
- block
No * dev->nChunksPerB
lock *
- dev->
totalBytesPerC
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_
ExtendedT
ags t;
+ yaffs_
ext_t
ags t;
nandmtd2_ReadChunkWithTagsFromNAND(dev,
nandmtd2_ReadChunkWithTagsFromNAND(dev,
- block
N
o *
- dev->
nChunksPerB
lock, NULL,
+ block
_n
o *
+ dev->
param.chunks_per_b
lock, 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)