diff options
Diffstat (limited to 'yaffs_mtdif2_single.c')
| -rw-r--r-- | yaffs_mtdif2_single.c | 104 |
1 files changed, 44 insertions, 60 deletions
diff --git a/yaffs_mtdif2_single.c b/yaffs_mtdif2_single.c index d1643df..c013232 100644 --- a/yaffs_mtdif2_single.c +++ b/yaffs_mtdif2_single.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2010 Aleph One Ltd. + * Copyright (C) 2002-2011 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning <charles@aleph1.co.uk> @@ -15,33 +15,27 @@ #include "yportenv.h" #include "yaffs_trace.h" - #include "yaffs_mtdif2.h" - +#include "yaffs_packedtags2.h" +#include "yaffs_linux.h" #include "linux/mtd/mtd.h" #include "linux/types.h" #include "linux/time.h" -#include "yaffs_packedtags2.h" - -#include "yaffs_linux.h" /* NB For use with inband tags.... - * We assume that the data buffer is of size total_bytes_per_chunk so that we can also - * use it to load the tags. + * We assume that the data buffer is of size total_bytes_per_chunk so that + * we can also use it to load the tags. */ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk, - const u8 * data, + const u8 *data, const struct yaffs_ext_tags *tags) { struct mtd_info *mtd = yaffs_dev_to_mtd(dev); struct mtd_oob_ops ops; int retval = 0; - loff_t addr; - struct yaffs_packed_tags2 pt; - int packed_tags_size = dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt); void *packed_tags_ptr = @@ -61,14 +55,14 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk, BUG(); else if (dev->param.inband_tags) { struct yaffs_packed_tags2_tags_only *pt2tp; + pt2tp = - (struct yaffs_packed_tags2_tags_only *)(data + - dev-> - data_bytes_per_chunk); + (struct yaffs_packed_tags2_tags_only *) + (data + dev->data_bytes_per_chunk); yaffs_pack_tags2_tags_only(pt2tp, tags); } else { yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc); - } + } ops.mode = MTD_OOB_AUTO; ops.ooblen = (dev->param.inband_tags) ? 0 : packed_tags_size; @@ -80,24 +74,20 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk, if (retval == 0) return YAFFS_OK; - else - return YAFFS_FAIL; + + return YAFFS_FAIL; } int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk, - u8 * data, struct yaffs_ext_tags *tags) + u8 *data, struct yaffs_ext_tags *tags) { struct mtd_info *mtd = yaffs_dev_to_mtd(dev); struct mtd_oob_ops ops; - size_t dummy; int retval = 0; int local_data = 0; - loff_t addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk; - struct yaffs_packed_tags2 pt; - int packed_tags_size = dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt); void *packed_tags_ptr = @@ -107,19 +97,15 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk, "nandmtd2_read_chunk_tags chunk %d data %p tags %p", nand_chunk, data, tags); - if (dev->param.inband_tags) { - - if (!data) { - local_data = 1; - data = yaffs_get_temp_buffer(dev, __LINE__); - } - + if (dev->param.inband_tags && !data) { + local_data = 1; + data = yaffs_get_temp_buffer(dev); } - if (dev->param.inband_tags || (data && !tags)) + if (dev->param.inband_tags || (data && !tags)) { retval = mtd->read(mtd, addr, dev->param.total_bytes_per_chunk, &dummy, data); - else if (tags) { + } else if (tags) { ops.mode = MTD_OOB_AUTO; ops.ooblen = packed_tags_size; ops.len = data ? dev->data_bytes_per_chunk : packed_tags_size; @@ -129,46 +115,45 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk, retval = mtd->read_oob(mtd, addr, &ops); } - if (dev->param.inband_tags) { - if (tags) { - struct yaffs_packed_tags2_tags_only *pt2tp; - pt2tp = - (struct yaffs_packed_tags2_tags_only *)&data[dev-> - data_bytes_per_chunk]; - yaffs_unpack_tags2_tags_only(tags, pt2tp); - } - } else { - if (tags) { - memcpy(packed_tags_ptr, - yaffs_dev_to_lc(dev)->spare_buffer, - packed_tags_size); - yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc); - } + if (dev->param.inband_tags && tags) { + struct yaffs_packed_tags2_tags_only *pt2tp; + + pt2tp = + (struct yaffs_packed_tags2_tags_only *) + &data[dev->data_bytes_per_chunk]; + yaffs_unpack_tags2_tags_only(tags, pt2tp); + } else if (tags) { + memcpy(packed_tags_ptr, + yaffs_dev_to_lc(dev)->spare_buffer, + packed_tags_size); + yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc); } if (local_data) - yaffs_release_temp_buffer(dev, data, __LINE__); + yaffs_release_temp_buffer(dev, data); - if (tags && retval == -EBADMSG - && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) { + 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) { + 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; + + return YAFFS_FAIL; } int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no) { struct mtd_info *mtd = yaffs_dev_to_mtd(dev); int retval; + yaffs_trace(YAFFS_TRACE_MTD, "nandmtd2_mark_block_bad %d", block_no); @@ -179,9 +164,8 @@ int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no) if (retval == 0) return YAFFS_OK; - else - return YAFFS_FAIL; + return YAFFS_FAIL; } int nandmtd2_query_block(struct yaffs_dev *dev, int block_no, @@ -203,12 +187,13 @@ int nandmtd2_query_block(struct yaffs_dev *dev, int block_no, *seq_number = 0; } else { struct yaffs_ext_tags t; + nandmtd2_read_chunk_tags(dev, block_no * dev->param.chunks_per_block, NULL, &t); if (t.chunk_used) { *seq_number = t.seq_number; - *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING; + *state = YAFFS_BLOCK_STATE_NEEDS_SCAN; } else { *seq_number = 0; *state = YAFFS_BLOCK_STATE_EMPTY; @@ -219,7 +204,6 @@ int nandmtd2_query_block(struct yaffs_dev *dev, int block_no, if (retval == 0) return YAFFS_OK; - else - return YAFFS_FAIL; -} + return YAFFS_FAIL; +} |