X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_checkptrw.c;h=299130539b2b6fd15b20adbde67d99955260e57d;hp=d46f5634ac1f269b29defaf7a58790a0645087bd;hb=757a553001be4016e9c5d8880648d3703f34b10e;hpb=41573908f821bcb40750e7c069ea8f5178f630e5

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index d46f563..2991305 100644
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -14,19 +14,19 @@
 #include "yaffs_checkptrw.h"
 #include "yaffs_getblockinfo.h"
 
-static int yaffs2_checkpt_space_ok(yaffs_dev_t *dev)
+static int yaffs2_checkpt_space_ok(struct yaffs_dev *dev)
 {
-	int blocksAvailable = dev->n_erased_blocks - dev->param.n_reserved_blocks;
+	int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
 
 	T(YAFFS_TRACE_CHECKPOINT,
 		(TSTR("checkpt blocks available = %d" TENDSTR),
-		blocksAvailable));
+		blocks_avail));
 
-	return (blocksAvailable <= 0) ? 0 : 1;
+	return (blocks_avail <= 0) ? 0 : 1;
 }
 
 
-static int yaffs_checkpt_erase(yaffs_dev_t *dev)
+static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 {
 	int i;
 
@@ -36,7 +36,7 @@ static int yaffs_checkpt_erase(yaffs_dev_t *dev)
 		dev->internal_start_block, dev->internal_end_block));
 
 	for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-		yaffs_block_info_t *bi = yaffs_get_block_info(dev, i);
+		struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
 		if (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT) {
 			T(YAFFS_TRACE_CHECKPOINT, (TSTR("erasing checkpt block %d"TENDSTR), i));
 
@@ -59,20 +59,20 @@ static int yaffs_checkpt_erase(yaffs_dev_t *dev)
 }
 
 
-static void yaffs2_checkpt_find_erased_block(yaffs_dev_t *dev)
+static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
 {
 	int  i;
-	int blocksAvailable = dev->n_erased_blocks - dev->param.n_reserved_blocks;
+	int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
 	T(YAFFS_TRACE_CHECKPOINT,
 		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
-		dev->n_erased_blocks, dev->param.n_reserved_blocks, blocksAvailable, dev->checkpt_next_block));
+		dev->n_erased_blocks, dev->param.n_reserved_blocks, blocks_avail, dev->checkpt_next_block));
 
 	if (dev->checkpt_next_block >= 0 &&
 			dev->checkpt_next_block <= dev->internal_end_block &&
-			blocksAvailable > 0) {
+			blocks_avail > 0) {
 
 		for (i = dev->checkpt_next_block; i <= dev->internal_end_block; i++) {
-			yaffs_block_info_t *bi = yaffs_get_block_info(dev, i);
+			struct yaffs_block_info *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;
@@ -87,10 +87,10 @@ static void yaffs2_checkpt_find_erased_block(yaffs_dev_t *dev)
 	dev->checkpt_cur_block = -1;
 }
 
-static void yaffs2_checkpt_find_block(yaffs_dev_t *dev)
+static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 {
 	int  i;
-	yaffs_ext_tags tags;
+	struct yaffs_ext_tags tags;
 
 	T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: start:  blocks %d next %d" TENDSTR),
 		dev->blocks_in_checkpt, dev->checkpt_next_block));
@@ -98,9 +98,9 @@ static void yaffs2_checkpt_find_block(yaffs_dev_t *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 realignedChunk = chunk - dev->chunk_offset;
+			int realigned_chunk = chunk - dev->chunk_offset;
 
-			dev->param.read_chunk_tags_fn(dev, realignedChunk,
+			dev->param.read_chunk_tags_fn(dev, realigned_chunk,
 					NULL, &tags);
 			T(YAFFS_TRACE_CHECKPOINT, (TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR),
 				i, tags.obj_id, tags.seq_number, tags.ecc_result));
@@ -123,11 +123,11 @@ static void yaffs2_checkpt_find_block(yaffs_dev_t *dev)
 }
 
 
-int yaffs2_checkpt_open(yaffs_dev_t *dev, int forWriting)
+int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
 {
 
 
-	dev->checkpt_open_write = forWriting;
+	dev->checkpt_open_write = writing;
 
 	/* Got the functions we need? */
 	if (!dev->param.write_chunk_tags_fn ||
@@ -136,7 +136,7 @@ int yaffs2_checkpt_open(yaffs_dev_t *dev, int forWriting)
 		!dev->param.bad_block_fn)
 		return 0;
 
-	if (forWriting && !yaffs2_checkpt_space_ok(dev))
+	if (writing && !yaffs2_checkpt_space_ok(dev))
 		return 0;
 
 	if (!dev->checkpt_buffer)
@@ -154,7 +154,7 @@ int yaffs2_checkpt_open(yaffs_dev_t *dev, int forWriting)
 	dev->checkpt_next_block = dev->internal_start_block;
 
 	/* Erase all the blocks in the checkpoint area */
-	if (forWriting) {
+	if (writing) {
 		memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
 		dev->checkpt_byte_offs = 0;
 		return yaffs_checkpt_erase(dev);
@@ -177,20 +177,20 @@ int yaffs2_checkpt_open(yaffs_dev_t *dev, int forWriting)
 	return 1;
 }
 
-int yaffs2_get_checkpt_sum(yaffs_dev_t *dev, __u32 *sum)
+int yaffs2_get_checkpt_sum(struct yaffs_dev *dev, u32 *sum)
 {
-	__u32 compositeSum;
-	compositeSum =  (dev->checkpt_sum << 8) | (dev->checkpt_xor & 0xFF);
-	*sum = compositeSum;
+	u32 composite_sum;
+	composite_sum =  (dev->checkpt_sum << 8) | (dev->checkpt_xor & 0xFF);
+	*sum = composite_sum;
 	return 1;
 }
 
-static int yaffs2_checkpt_flush_buffer(yaffs_dev_t *dev)
+static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
 {
 	int chunk;
-	int realignedChunk;
+	int realigned_chunk;
 
-	yaffs_ext_tags tags;
+	struct yaffs_ext_tags tags;
 
 	if (dev->checkpt_cur_block < 0) {
 		yaffs2_checkpt_find_erased_block(dev);
@@ -208,7 +208,7 @@ static int yaffs2_checkpt_flush_buffer(yaffs_dev_t *dev)
 	if (dev->checkpt_cur_chunk == 0) {
 		/* First chunk we write for the block? Set block state to
 		   checkpoint */
-		yaffs_block_info_t *bi = yaffs_get_block_info(dev, dev->checkpt_cur_block);
+		struct yaffs_block_info *bi = yaffs_get_block_info(dev, dev->checkpt_cur_block);
 		bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT;
 		dev->blocks_in_checkpt++;
 	}
@@ -219,11 +219,11 @@ static int yaffs2_checkpt_flush_buffer(yaffs_dev_t *dev)
 	T(YAFFS_TRACE_CHECKPOINT, (TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
 		chunk, dev->checkpt_cur_block, dev->checkpt_cur_chunk, tags.obj_id, tags.chunk_id));
 
-	realignedChunk = chunk - dev->chunk_offset;
+	realigned_chunk = chunk - dev->chunk_offset;
 
 	dev->n_page_writes++;
 
-	dev->param.write_chunk_tags_fn(dev, realignedChunk,
+	dev->param.write_chunk_tags_fn(dev, realigned_chunk,
 			dev->checkpt_buffer, &tags);
 	dev->checkpt_byte_offs = 0;
 	dev->checkpt_page_seq++;
@@ -238,13 +238,13 @@ static int yaffs2_checkpt_flush_buffer(yaffs_dev_t *dev)
 }
 
 
-int yaffs2_checkpt_wr(yaffs_dev_t *dev, const void *data, int n_bytes)
+int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
 {
 	int i = 0;
 	int ok = 1;
 
 
-	__u8 * dataBytes = (__u8 *)data;
+	u8 * data_bytes = (u8 *)data;
 
 
 
@@ -255,13 +255,13 @@ int yaffs2_checkpt_wr(yaffs_dev_t *dev, const void *data, int n_bytes)
 		return -1;
 
 	while (i < n_bytes && ok) {
-		dev->checkpt_buffer[dev->checkpt_byte_offs] = *dataBytes;
-		dev->checkpt_sum += *dataBytes;
-		dev->checkpt_xor ^= *dataBytes;
+		dev->checkpt_buffer[dev->checkpt_byte_offs] = *data_bytes;
+		dev->checkpt_sum += *data_bytes;
+		dev->checkpt_xor ^= *data_bytes;
 
 		dev->checkpt_byte_offs++;
 		i++;
-		dataBytes++;
+		data_bytes++;
 		dev->checkpt_byte_count++;
 
 
@@ -273,17 +273,17 @@ int yaffs2_checkpt_wr(yaffs_dev_t *dev, const void *data, int n_bytes)
 	return i;
 }
 
-int yaffs2_checkpt_rd(yaffs_dev_t *dev, void *data, int n_bytes)
+int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 {
 	int i = 0;
 	int ok = 1;
-	yaffs_ext_tags tags;
+	struct yaffs_ext_tags tags;
 
 
 	int chunk;
-	int realignedChunk;
+	int realigned_chunk;
 
-	__u8 *dataBytes = (__u8 *)data;
+	u8 *data_bytes = (u8 *)data;
 
 	if (!dev->checkpt_buffer)
 		return 0;
@@ -309,14 +309,13 @@ int yaffs2_checkpt_rd(yaffs_dev_t *dev, void *data, int n_bytes)
 					dev->param.chunks_per_block +
 					dev->checkpt_cur_chunk;
 
-				realignedChunk = chunk - dev->chunk_offset;
+				realigned_chunk = chunk - dev->chunk_offset;
 				
 				dev->n_page_reads++;
 
 				/* read in the next chunk */
-				/* printf("read checkpoint page %d\n",dev->checkpointPage); */
 				dev->param.read_chunk_tags_fn(dev,
-						realignedChunk,
+						realigned_chunk,
 						dev->checkpt_buffer,
 						&tags);
 
@@ -335,12 +334,12 @@ int yaffs2_checkpt_rd(yaffs_dev_t *dev, void *data, int n_bytes)
 		}
 
 		if (ok) {
-			*dataBytes = dev->checkpt_buffer[dev->checkpt_byte_offs];
-			dev->checkpt_sum += *dataBytes;
-			dev->checkpt_xor ^= *dataBytes;
+			*data_bytes = dev->checkpt_buffer[dev->checkpt_byte_offs];
+			dev->checkpt_sum += *data_bytes;
+			dev->checkpt_xor ^= *data_bytes;
 			dev->checkpt_byte_offs++;
 			i++;
-			dataBytes++;
+			data_bytes++;
 			dev->checkpt_byte_count++;
 		}
 	}
@@ -348,7 +347,7 @@ int yaffs2_checkpt_rd(yaffs_dev_t *dev, void *data, int n_bytes)
 	return 	i;
 }
 
-int yaffs_checkpt_close(yaffs_dev_t *dev)
+int yaffs_checkpt_close(struct yaffs_dev *dev)
 {
 
 	if (dev->checkpt_open_write) {
@@ -358,7 +357,7 @@ int yaffs_checkpt_close(yaffs_dev_t *dev)
 		int i;
 		for (i = 0; i < dev->blocks_in_checkpt && dev->checkpt_block_list[i] >= 0; i++) {
 			int blk = dev->checkpt_block_list[i];
-			yaffs_block_info_t *bi = NULL;
+			struct yaffs_block_info *bi = NULL;
 			if( dev->internal_start_block <= blk && blk <= dev->internal_end_block)
 				bi = yaffs_get_block_info(dev, blk);
 			if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY)
@@ -387,7 +386,7 @@ int yaffs_checkpt_close(yaffs_dev_t *dev)
 		return 0;
 }
 
-int yaffs2_checkpt_invalidate_stream(yaffs_dev_t *dev)
+int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev)
 {
 	/* Erase the checkpoint data */