X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_nand.c;h=165d01004d6efde447d4b88a42f38c74dafa5fed;hp=6964ad18c0d567a04ddf404e4d5dcaf09e720a17;hb=912be3d8414dea3a2ebf1792698174d3b6d3cbf1;hpb=4778ade2698a2de536594ee9cbf32db58346b59c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 6964ad1..165d010 100644
--- a/yaffs_nand.c
+++ b/yaffs_nand.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>
@@ -13,128 +13,108 @@
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
-#include "yaffs_tagsvalidity.h"
 
 #include "yaffs_getblockinfo.h"
+#include "yaffs_summary.h"
 
-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-					   __u8 *buffer,
-					   yaffs_ExtendedTags *tags)
+int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
+			     u8 *buffer, struct yaffs_ext_tags *tags)
 {
 	int result;
-	yaffs_ExtendedTags localTags;
+	struct yaffs_ext_tags local_tags;
+	int flash_chunk = nand_chunk - dev->chunk_offset;
 
-	int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
+	dev->n_page_reads++;
 
-	dev->nPageReads++;
-
-	/* 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 = &localTags;
+		tags = &local_tags;
 
-	if (dev->param.readChunkWithTagsFromNAND)
-		result = dev->param.readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
-						      tags);
+	if (dev->param.read_chunk_tags_fn)
+		result =
+		    dev->param.read_chunk_tags_fn(dev, flash_chunk, buffer,
+						  tags);
 	else
-		result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
-									realignedChunkInNAND,
-									buffer,
-									tags);
-	if (tags &&
-	   tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
-
-		yaffs_BlockInfo *bi;
-		bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->param.nChunksPerBlock);
-		yaffs_HandleChunkError(dev, bi);
+		result = yaffs_tags_compat_rd(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_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-						   int chunkInNAND,
-						   const __u8 *buffer,
-						   yaffs_ExtendedTags *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 = nand_chunk - dev->chunk_offset;
 
-	dev->nPageWrites++;
-
-	chunkInNAND -= dev->chunkOffset;
-
+	dev->n_page_writes++;
 
 	if (tags) {
-		tags->sequenceNumber = dev->sequenceNumber;
-		tags->chunkUsed = 1;
-		if (!yaffs_ValidateTags(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->objectId, tags->chunkId));
+		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);
 	} else {
-		T(YAFFS_TRACE_ERROR, (TSTR("Writing with no tags" TENDSTR)));
-		YBUG();
+		yaffs_trace(YAFFS_TRACE_ERROR, "Writing with no tags");
+		BUG();
+		return YAFFS_FAIL;
 	}
 
-	if (dev->param.writeChunkWithTagsToNAND)
-		return dev->param.writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
-						     tags);
+	if (dev->param.write_chunk_tags_fn)
+		result = dev->param.write_chunk_tags_fn(dev, flash_chunk,
+							buffer, tags);
 	else
-		return yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(dev,
-								       chunkInNAND,
-								       buffer,
-								       tags);
+		result = yaffs_tags_compat_wr(dev, flash_chunk, buffer, tags);
+
+	yaffs_summary_add(dev, tags, nand_chunk);
+
+	return result;
 }
 
-int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
+int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
 {
-	blockNo -= dev->blockOffset;
-
+	block_no -= dev->block_offset;
+	if (dev->param.bad_block_fn)
+		return dev->param.bad_block_fn(dev, block_no);
 
-	if (dev->param.markNANDBlockBad)
-		return dev->param.markNANDBlockBad(dev, blockNo);
-	else
-		return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
+	return yaffs_tags_compat_mark_bad(dev, block_no);
 }
 
-int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-						 int blockNo,
-						 yaffs_BlockState *state,
-						 __u32 *sequenceNumber)
+int yaffs_query_init_block_state(struct yaffs_dev *dev,
+				 int block_no,
+				 enum yaffs_block_state *state,
+				 u32 *seq_number)
 {
-	blockNo -= dev->blockOffset;
+	block_no -= dev->block_offset;
+	if (dev->param.query_block_fn)
+		return dev->param.query_block_fn(dev, block_no, state,
+						 seq_number);
 
-	if (dev->param.queryNANDBlock)
-		return dev->param.queryNANDBlock(dev, blockNo, state, sequenceNumber);
-	else
-		return yaffs_TagsCompatabilityQueryNANDBlock(dev, blockNo,
-							     state,
-							     sequenceNumber);
+	return yaffs_tags_compat_query_block(dev, block_no, state, seq_number);
 }
 
-
-int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-				  int blockInNAND)
+int yaffs_erase_block(struct yaffs_dev *dev, int flash_block)
 {
 	int result;
 
-	blockInNAND -= dev->blockOffset;
-
-	dev->nBlockErasures++;
-
-	result = dev->param.eraseBlockInNAND(dev, blockInNAND);
-
+	flash_block -= dev->block_offset;
+	dev->n_erasures++;
+	result = dev->param.erase_fn(dev, flash_block);
 	return result;
 }
 
-int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
+int yaffs_init_nand(struct yaffs_dev *dev)
 {
-	if(dev->param.initialiseNAND)
-		return dev->param.initialiseNAND(dev);
+	if (dev->param.initialise_flash_fn)
+		return dev->param.initialise_flash_fn(dev);
 	return YAFFS_OK;
 }
-
-
-