/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-2010 Aleph One Ltd.
- * for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
-#include "yaffs_tagsvalidity.h"
#include "yaffs_getblockinfo.h"
+#include "yaffs_summary.h"
-int yaffs_rd_chunk_tags_nand(yaffs_dev_t *dev, int nand_chunk,
- __u8 *buffer,
- yaffs_ext_tags *tags)
+static int apply_chunk_offset(struct yaffs_dev *dev, int chunk)
{
- int result;
- yaffs_ext_tags local_tags;
+ return chunk - dev->chunk_offset;
+}
- int realigned_chunk = nand_chunk - dev->chunk_offset;
+int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
+ u8 *buffer, struct yaffs_ext_tags *tags)
+{
+ int result;
+ struct yaffs_ext_tags local_tags;
+ int flash_chunk = apply_chunk_offset(dev, nand_chunk);
dev->n_page_reads++;
- /* If there are no tags provided, use local tags to get prioritised gc working */
+ /* If there are no tags provided use local tags. */
if (!tags)
tags = &local_tags;
- if (dev->param.read_chunk_tags_fn)
- result = dev->param.read_chunk_tags_fn(dev, realigned_chunk, buffer,
- tags);
- else
- result = yaffs_tags_compat_rd(dev,
- realigned_chunk,
- buffer,
- tags);
- if (tags &&
- tags->ecc_result > YAFFS_ECC_RESULT_NO_ERROR) {
-
- yaffs_block_info_t *bi;
- bi = yaffs_get_block_info(dev, nand_chunk/dev->param.chunks_per_block);
+ result = dev->tagger.read_chunk_tags_fn(dev, flash_chunk, buffer, tags);
+ if (tags && tags->ecc_result > YAFFS_ECC_RESULT_NO_ERROR) {
+
+ struct yaffs_block_info *bi;
+ bi = yaffs_get_block_info(dev,
+ nand_chunk /
+ dev->param.chunks_per_block);
yaffs_handle_chunk_error(dev, bi);
}
-
return result;
}
-int yaffs_wr_chunk_tags_nand(yaffs_dev_t *dev,
- int nand_chunk,
- const __u8 *buffer,
- yaffs_ext_tags *tags)
+int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
+ int nand_chunk,
+ const u8 *buffer, struct yaffs_ext_tags *tags)
{
+ int result;
+ int flash_chunk = apply_chunk_offset(dev, nand_chunk);
dev->n_page_writes++;
- nand_chunk -= dev->chunk_offset;
-
-
- if (tags) {
- tags->seq_number = dev->seq_number;
- tags->chunk_used = 1;
- 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), nand_chunk,
- tags->obj_id, tags->chunk_id));
- } else {
- T(YAFFS_TRACE_ERROR, (TSTR("Writing with no tags" TENDSTR)));
- YBUG();
+ if (!tags) {
+ yaffs_trace(YAFFS_TRACE_ERROR, "Writing with no tags");
+ BUG();
+ return YAFFS_FAIL;
}
- 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,
- nand_chunk,
- buffer,
- tags);
+ tags->seq_number = dev->seq_number;
+ tags->chunk_used = 1;
+ yaffs_trace(YAFFS_TRACE_WRITE,
+ "Writing chunk %d tags %d %d",
+ nand_chunk, tags->obj_id, tags->chunk_id);
+
+ result = dev->tagger.write_chunk_tags_fn(dev, flash_chunk,
+ buffer, tags);
+
+ yaffs_summary_add(dev, tags, nand_chunk);
+
+ return result;
}
-int yaffs_mark_bad(yaffs_dev_t *dev, int block_no)
+int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
{
block_no -= dev->block_offset;
+ dev->n_bad_markings++;
+ if (dev->param.disable_bad_block_marking)
+ return YAFFS_OK;
- if (dev->param.bad_block_fn)
- return dev->param.bad_block_fn(dev, block_no);
- else
- return yaffs_tags_compat_mark_bad(dev, block_no);
+ return dev->tagger.mark_bad_fn(dev, block_no);
}
-int yaffs_query_init_block_state(yaffs_dev_t *dev,
- int block_no,
- yaffs_block_state_t *state,
- __u32 *seq_number)
+
+int yaffs_query_init_block_state(struct yaffs_dev *dev,
+ int block_no,
+ enum yaffs_block_state *state,
+ u32 *seq_number)
{
block_no -= dev->block_offset;
-
- if (dev->param.query_block_fn)
- return dev->param.query_block_fn(dev, block_no, state, seq_number);
- else
- return yaffs_tags_compat_query_block(dev, block_no,
- state,
- seq_number);
+ return dev->tagger.query_block_fn(dev, block_no, state, seq_number);
}
-
-int yaffs_erase_block(struct yaffs_dev_s *dev,
- int flash_block)
+int yaffs_erase_block(struct yaffs_dev *dev, int block_no)
{
int result;
- flash_block -= dev->block_offset;
-
+ block_no -= dev->block_offset;
dev->n_erasures++;
-
- result = dev->param.erase_fn(dev, flash_block);
-
+ result = dev->drv.drv_erase_fn(dev, block_no);
return result;
}
-int yaffs_init_nand(struct yaffs_dev_s *dev)
+int yaffs_init_nand(struct yaffs_dev *dev)
{
- if(dev->param.initialise_flash_fn)
- return dev->param.initialise_flash_fn(dev);
+ if (dev->drv.drv_initialise_fn)
+ return dev->drv.drv_initialise_fn(dev);
return YAFFS_OK;
}
-
-
+int yaffs_deinit_nand(struct yaffs_dev *dev)
+{
+ if (dev->drv.drv_deinitialise_fn)
+ return dev->drv.drv_deinitialise_fn(dev);
+ return YAFFS_OK;
+}
projects / yaffs2.git / blobdiff