X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_checkptrw.c;h=f67d6be2c2c6e8a2aa3a7b9503f2e931861f4be4;hp=997a618aee86c80435e722a22e87a58f7bc9b620;hb=refs%2Fheads%2Fclean-up;hpb=472c70456396a6f2019bfabe83bd292782dbd978

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index 997a618..f67d6be 100644
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -14,6 +14,52 @@
 #include "yaffs_checkptrw.h"
 #include "yaffs_getblockinfo.h"
 
+struct yaffs_checkpt_chunk_hdr {
+	int version;
+	u32 seq;
+	u32 sum;
+	u32 xor;
+} ;
+
+
+static int apply_chunk_offset(struct yaffs_dev *dev, int chunk)
+{
+	return chunk - dev->chunk_offset;
+}
+
+static int apply_block_offset(struct yaffs_dev *dev, int block)
+{
+	return block - dev->block_offset;
+}
+
+static void yaffs2_checkpt_init_chunk_hdr(struct yaffs_dev *dev)
+{
+	struct yaffs_checkpt_chunk_hdr hdr;
+
+	hdr.version = YAFFS_CHECKPOINT_VERSION;
+	hdr.seq = dev->checkpt_page_seq;
+	hdr.sum = dev->checkpt_sum;
+	hdr.xor = dev->checkpt_xor;
+
+	dev->checkpt_byte_offs = sizeof(hdr);
+
+	memcpy(dev->checkpt_buffer, &hdr, sizeof(hdr));
+}
+
+static int yaffs2_checkpt_check_chunk_hdr(struct yaffs_dev *dev)
+{
+	struct yaffs_checkpt_chunk_hdr hdr;
+
+	memcpy(&hdr, dev->checkpt_buffer, sizeof(hdr));
+
+	dev->checkpt_byte_offs = sizeof(hdr);
+
+	return hdr.version == YAFFS_CHECKPOINT_VERSION &&
+		hdr.seq == dev->checkpt_page_seq &&
+		hdr.sum == dev->checkpt_sum &&
+		hdr.xor == dev->checkpt_xor;
+}
+
 static int yaffs2_checkpt_space_ok(struct yaffs_dev *dev)
 {
 	int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
@@ -26,9 +72,9 @@ static int yaffs2_checkpt_space_ok(struct yaffs_dev *dev)
 
 static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 {
-	int i;
+	u32 i;
 
-	if (!dev->param.erase_fn)
+	if (!dev->drv.drv_erase_fn)
 		return 0;
 	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
 		"checking blocks %d to %d",
@@ -36,21 +82,23 @@ static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 
 	for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
 		struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
+		int offset_i = apply_block_offset(dev, i);
+		int result;
+
 		if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
 			yaffs_trace(YAFFS_TRACE_CHECKPOINT,
 			"erasing checkpt block %d", i);
 
 			dev->n_erasures++;
 
-			if (dev->param.
-			    erase_fn(dev,
-				     i - dev->block_offset /* realign */)) {
+			result = dev->drv.drv_erase_fn(dev, offset_i);
+			if(result) {
 				bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
 				dev->n_erased_blocks++;
 				dev->n_free_chunks +=
 				    dev->param.chunks_per_block;
 			} else {
-				dev->param.bad_block_fn(dev, i);
+				dev->drv.drv_mark_bad_fn(dev, offset_i);
 				bi->block_state = YAFFS_BLOCK_STATE_DEAD;
 			}
 		}
@@ -63,7 +111,7 @@ static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 
 static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
 {
-	int i;
+	u32 i;
 	int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
 
 	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
@@ -71,14 +119,15 @@ static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
 		dev->n_erased_blocks, dev->param.n_reserved_blocks,
 		blocks_avail, dev->checkpt_next_block);
 
-	if (dev->checkpt_next_block >= 0 &&
+	if (dev->checkpt_next_block >= dev->internal_start_block &&
 	    dev->checkpt_next_block <= dev->internal_end_block &&
 	    blocks_avail > 0) {
 
 		for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
 		     i++) {
-			struct yaffs_block_info *bi =
-			    yaffs_get_block_info(dev, i);
+			struct yaffs_block_info *bi;
+
+			bi = yaffs_get_block_info(dev, i);
 			if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
 				dev->checkpt_next_block = i + 1;
 				dev->checkpt_cur_block = i;
@@ -90,13 +139,13 @@ static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
 	}
 	yaffs_trace(YAFFS_TRACE_CHECKPOINT, "out of checkpt blocks");
 
-	dev->checkpt_next_block = -1;
-	dev->checkpt_cur_block = -1;
+	dev->checkpt_next_block = 0;
+	dev->checkpt_cur_block = 0;
 }
 
 static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 {
-	int i;
+	u32 i;
 	struct yaffs_ext_tags tags;
 
 	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
@@ -106,33 +155,42 @@ static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 	if (dev->blocks_in_checkpt < dev->checkpt_max_blocks)
 		for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
 		     i++) {
-			int chunk = i * dev->param.chunks_per_block;
-			int realigned_chunk = chunk - dev->chunk_offset;
+			u32 chunk = i * dev->param.chunks_per_block;
+			enum yaffs_block_state state;
+			u32 seq;
 
-			dev->param.read_chunk_tags_fn(dev, realigned_chunk,
-						      NULL, &tags);
+			dev->tagger.read_chunk_tags_fn(dev,
+					apply_chunk_offset(dev, chunk),
+					NULL, &tags);
 			yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-				"find next checkpt block: search: block %d oid %d seq %d eccr %d",
-				i, tags.obj_id, tags.seq_number,
+				"find next checkpt block: search: block %d state %d oid %d seq %d eccr %d",
+				i, (int) state,
+				tags.obj_id, tags.seq_number,
 				tags.ecc_result);
 
-			if (tags.seq_number == YAFFS_SEQUENCE_CHECKPOINT_DATA) {
-				/* Right kind of block */
-				dev->checkpt_next_block = tags.obj_id;
-				dev->checkpt_cur_block = i;
-				dev->checkpt_block_list[dev->
-							blocks_in_checkpt] = i;
-				dev->blocks_in_checkpt++;
-				yaffs_trace(YAFFS_TRACE_CHECKPOINT,
-					"found checkpt block %d", i);
-				return;
-			}
+			if (tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
+				continue;
+
+			dev->tagger.query_block_fn(dev,
+						apply_block_offset(dev, i),
+						&state, &seq);
+			if (state == YAFFS_BLOCK_STATE_DEAD)
+				continue;
+
+			/* Right kind of block */
+			dev->checkpt_next_block = tags.obj_id;
+			dev->checkpt_cur_block = i;
+			dev->checkpt_block_list[dev->blocks_in_checkpt] = i;
+			dev->blocks_in_checkpt++;
+			yaffs_trace(YAFFS_TRACE_CHECKPOINT,
+				"found checkpt block %d", i);
+			return;
 		}
 
 	yaffs_trace(YAFFS_TRACE_CHECKPOINT, "found no more checkpt blocks");
 
-	dev->checkpt_next_block = -1;
-	dev->checkpt_cur_block = -1;
+	dev->checkpt_next_block = 0;
+	dev->checkpt_cur_block = 0;
 }
 
 int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
@@ -142,9 +200,10 @@ int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
 	dev->checkpt_open_write = writing;
 
 	/* Got the functions we need? */
-	if (!dev->param.write_chunk_tags_fn ||
-	    !dev->param.read_chunk_tags_fn ||
-	    !dev->param.erase_fn || !dev->param.bad_block_fn)
+	if (!dev->tagger.write_chunk_tags_fn ||
+	    !dev->tagger.read_chunk_tags_fn ||
+	    !dev->drv.drv_erase_fn ||
+	    !dev->drv.drv_mark_bad_fn)
 		return 0;
 
 	if (writing && !yaffs2_checkpt_space_ok(dev))
@@ -160,17 +219,17 @@ int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
 	dev->checkpt_byte_count = 0;
 	dev->checkpt_sum = 0;
 	dev->checkpt_xor = 0;
-	dev->checkpt_cur_block = -1;
-	dev->checkpt_cur_chunk = -1;
+	dev->checkpt_cur_block = 0;
+	dev->checkpt_cur_chunk = 0;
 	dev->checkpt_next_block = dev->internal_start_block;
 
-	/* Erase all the blocks in the checkpoint area */
 	if (writing) {
 		memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
-		dev->checkpt_byte_offs = 0;
+		yaffs2_checkpt_init_chunk_hdr(dev);
 		return yaffs_checkpt_erase(dev);
 	}
 
+	/* Opening for a read */
 	/* Set to a value that will kick off a read */
 	dev->checkpt_byte_offs = dev->data_bytes_per_chunk;
 	/* A checkpoint block list of 1 checkpoint block per 16 block is
@@ -202,15 +261,15 @@ int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 * sum)
 static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
 {
 	int chunk;
-	int realigned_chunk;
+	int offset_chunk;
 	struct yaffs_ext_tags tags;
 
-	if (dev->checkpt_cur_block < 0) {
+	if (dev->checkpt_cur_block < dev->internal_start_block) {
 		yaffs2_checkpt_find_erased_block(dev);
 		dev->checkpt_cur_chunk = 0;
 	}
 
-	if (dev->checkpt_cur_block < 0)
+	if (dev->checkpt_cur_block < dev->internal_start_block)
 		return 0;
 
 	tags.is_deleted = 0;
@@ -236,21 +295,23 @@ static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
 		chunk, dev->checkpt_cur_block, dev->checkpt_cur_chunk,
 		tags.obj_id, tags.chunk_id);
 
-	realigned_chunk = chunk - dev->chunk_offset;
+	offset_chunk = apply_chunk_offset(dev, chunk);
 
 	dev->n_page_writes++;
 
-	dev->param.write_chunk_tags_fn(dev, realigned_chunk,
+	dev->tagger.write_chunk_tags_fn(dev, offset_chunk,
 				       dev->checkpt_buffer, &tags);
-	dev->checkpt_byte_offs = 0;
 	dev->checkpt_page_seq++;
 	dev->checkpt_cur_chunk++;
 	if (dev->checkpt_cur_chunk >= dev->param.chunks_per_block) {
 		dev->checkpt_cur_chunk = 0;
-		dev->checkpt_cur_block = -1;
+		dev->checkpt_cur_block = 0;
 	}
 	memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
 
+	yaffs2_checkpt_init_chunk_hdr(dev);
+
+
 	return 1;
 }
 
@@ -276,8 +337,7 @@ int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
 		data_bytes++;
 		dev->checkpt_byte_count++;
 
-		if (dev->checkpt_byte_offs < 0 ||
-		    dev->checkpt_byte_offs >= dev->data_bytes_per_chunk)
+		if (dev->checkpt_byte_offs >= dev->data_bytes_per_chunk)
 			ok = yaffs2_checkpt_flush_buffer(dev);
 	}
 
@@ -290,7 +350,7 @@ int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 	int ok = 1;
 	struct yaffs_ext_tags tags;
 	int chunk;
-	int realigned_chunk;
+	int offset_chunk;
 	u8 *data_bytes = (u8 *) data;
 
 	if (!dev->checkpt_buffer)
@@ -301,15 +361,16 @@ int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 
 	while (i < n_bytes && ok) {
 
-		if (dev->checkpt_byte_offs < 0 ||
-		    dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
+		if (dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
 
-			if (dev->checkpt_cur_block < 0) {
+			if (dev->checkpt_cur_block <
+			    dev->internal_start_block) {
 				yaffs2_checkpt_find_block(dev);
 				dev->checkpt_cur_chunk = 0;
 			}
 
-			if (dev->checkpt_cur_block < 0) {
+			if (dev->checkpt_cur_block <
+			    dev->internal_start_block) {
 				ok = 0;
 				break;
 			}
@@ -318,12 +379,12 @@ int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 			    dev->param.chunks_per_block +
 			    dev->checkpt_cur_chunk;
 
-			realigned_chunk = chunk - dev->chunk_offset;
+			offset_chunk = apply_chunk_offset(dev, chunk);
 			dev->n_page_reads++;
 
 			/* read in the next chunk */
-			dev->param.read_chunk_tags_fn(dev,
-						realigned_chunk,
+			dev->tagger.read_chunk_tags_fn(dev,
+						offset_chunk,
 						dev->checkpt_buffer,
 						&tags);
 
@@ -333,14 +394,18 @@ int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 				ok = 0;
 				break;
 			}
+			if(!yaffs2_checkpt_check_chunk_hdr(dev)) {
+				ok = 0;
+				break;
+			}
 
-			dev->checkpt_byte_offs = 0;
 			dev->checkpt_page_seq++;
 			dev->checkpt_cur_chunk++;
 
-			if (dev->checkpt_cur_chunk >=
+			if (dev->checkpt_cur_chunk >
 					dev->param.chunks_per_block)
-				dev->checkpt_cur_block = -1;
+				dev->checkpt_cur_block = 0;
+
 		}
 
 		*data_bytes = dev->checkpt_buffer[dev->checkpt_byte_offs];
@@ -360,13 +425,14 @@ int yaffs_checkpt_close(struct yaffs_dev *dev)
 	int i;
 
 	if (dev->checkpt_open_write) {
-		if (dev->checkpt_byte_offs != 0)
+		if (dev->checkpt_byte_offs !=
+			sizeof(sizeof(struct yaffs_checkpt_chunk_hdr)))
 			yaffs2_checkpt_flush_buffer(dev);
 	} else if (dev->checkpt_block_list) {
 		for (i = 0;
 		     i < dev->blocks_in_checkpt &&
-		     dev->checkpt_block_list[i] >= 0; i++) {
-			int blk = dev->checkpt_block_list[i];
+		     dev->checkpt_block_list[i] > 0; i++) {
+			u32 blk = dev->checkpt_block_list[i];
 			struct yaffs_block_info *bi = NULL;
 
 			if (dev->internal_start_block <= blk &&