X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_tagscompat.c;h=3a9a157e7e2470c44252cb338363347db7b04569;hp=c04a2fb3bd6efdf0a7e085316dc2a527d4fac285;hb=a6b656e2ec808ffab1b5f46babcdc5f7b49b7a46;hpb=41573908f821bcb40750e7c069ea8f5178f630e5

diff --git a/yaffs_tagscompat.c b/yaffs_tagscompat.c
index c04a2fb..3a9a157 100644
--- a/yaffs_tagscompat.c
+++ b/yaffs_tagscompat.c
@@ -17,16 +17,7 @@
 #include "yaffs_getblockinfo.h"
 #include "yaffs_trace.h"
 
-static void yaffs_handle_rd_data_error(yaffs_dev_t *dev, int nand_chunk);
-#ifdef NOTYET
-static void yaffs_check_written_block(yaffs_dev_t *dev, int nand_chunk);
-static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk,
-				     const __u8 *data,
-				     const yaffs_spare *spare);
-static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk,
-				    const yaffs_spare *spare);
-static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk);
-#endif
+static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
 
 static const char yaffs_count_bits_table[256] = {
 	0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
@@ -47,26 +38,26 @@ static const char yaffs_count_bits_table[256] = {
 	4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
 };
 
-int yaffs_count_bits(__u8 x)
+int yaffs_count_bits(u8 x)
 {
-	int retVal;
-	retVal = yaffs_count_bits_table[x];
-	return retVal;
+	int ret_val;
+	ret_val = yaffs_count_bits_table[x];
+	return ret_val;
 }
 
 /********** Tags ECC calculations  *********/
 
-void yaffs_calc_ecc(const __u8 *data, yaffs_spare *spare)
+void yaffs_calc_ecc(const u8 * data, struct yaffs_spare *spare)
 {
 	yaffs_ecc_cacl(data, spare->ecc1);
 	yaffs_ecc_cacl(&data[256], spare->ecc2);
 }
 
-void yaffs_calc_tags_ecc(yaffs_tags_t *tags)
+void yaffs_calc_tags_ecc(struct yaffs_tags *tags)
 {
 	/* Calculate an ecc */
 
-	unsigned char *b = ((yaffs_tags_union_t *) tags)->as_bytes;
+	unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
 	unsigned i, j;
 	unsigned ecc = 0;
 	unsigned bit = 0;
@@ -85,7 +76,7 @@ void yaffs_calc_tags_ecc(yaffs_tags_t *tags)
 
 }
 
-int yaffs_check_tags_ecc(yaffs_tags_t *tags)
+int yaffs_check_tags_ecc(struct yaffs_tags *tags)
 {
 	unsigned ecc = tags->ecc;
 
@@ -95,7 +86,7 @@ int yaffs_check_tags_ecc(yaffs_tags_t *tags)
 
 	if (ecc && ecc <= 64) {
 		/* TODO: Handle the failure better. Retire? */
-		unsigned char *b = ((yaffs_tags_union_t *) tags)->as_bytes;
+		unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
 
 		ecc--;
 
@@ -116,53 +107,54 @@ int yaffs_check_tags_ecc(yaffs_tags_t *tags)
 
 /********** Tags **********/
 
-static void yaffs_load_tags_to_spare(yaffs_spare *sparePtr,
-				yaffs_tags_t *tagsPtr)
+static void yaffs_load_tags_to_spare(struct yaffs_spare *spare_ptr,
+				     struct yaffs_tags *tags_ptr)
 {
-	yaffs_tags_union_t *tu = (yaffs_tags_union_t *) tagsPtr;
-
-	yaffs_calc_tags_ecc(tagsPtr);
-
-	sparePtr->tb0 = tu->as_bytes[0];
-	sparePtr->tb1 = tu->as_bytes[1];
-	sparePtr->tb2 = tu->as_bytes[2];
-	sparePtr->tb3 = tu->as_bytes[3];
-	sparePtr->tb4 = tu->as_bytes[4];
-	sparePtr->tb5 = tu->as_bytes[5];
-	sparePtr->tb6 = tu->as_bytes[6];
-	sparePtr->tb7 = tu->as_bytes[7];
+	union yaffs_tags_union *tu = (union yaffs_tags_union *)tags_ptr;
+
+	yaffs_calc_tags_ecc(tags_ptr);
+
+	spare_ptr->tb0 = tu->as_bytes[0];
+	spare_ptr->tb1 = tu->as_bytes[1];
+	spare_ptr->tb2 = tu->as_bytes[2];
+	spare_ptr->tb3 = tu->as_bytes[3];
+	spare_ptr->tb4 = tu->as_bytes[4];
+	spare_ptr->tb5 = tu->as_bytes[5];
+	spare_ptr->tb6 = tu->as_bytes[6];
+	spare_ptr->tb7 = tu->as_bytes[7];
 }
 
-static void yaffs_get_tags_from_spare(yaffs_dev_t *dev, yaffs_spare *sparePtr,
-				yaffs_tags_t *tagsPtr)
+static void yaffs_get_tags_from_spare(struct yaffs_dev *dev,
+				      struct yaffs_spare *spare_ptr,
+				      struct yaffs_tags *tags_ptr)
 {
-	yaffs_tags_union_t *tu = (yaffs_tags_union_t *) tagsPtr;
+	union yaffs_tags_union *tu = (union yaffs_tags_union *)tags_ptr;
 	int result;
 
-	tu->as_bytes[0] = sparePtr->tb0;
-	tu->as_bytes[1] = sparePtr->tb1;
-	tu->as_bytes[2] = sparePtr->tb2;
-	tu->as_bytes[3] = sparePtr->tb3;
-	tu->as_bytes[4] = sparePtr->tb4;
-	tu->as_bytes[5] = sparePtr->tb5;
-	tu->as_bytes[6] = sparePtr->tb6;
-	tu->as_bytes[7] = sparePtr->tb7;
+	tu->as_bytes[0] = spare_ptr->tb0;
+	tu->as_bytes[1] = spare_ptr->tb1;
+	tu->as_bytes[2] = spare_ptr->tb2;
+	tu->as_bytes[3] = spare_ptr->tb3;
+	tu->as_bytes[4] = spare_ptr->tb4;
+	tu->as_bytes[5] = spare_ptr->tb5;
+	tu->as_bytes[6] = spare_ptr->tb6;
+	tu->as_bytes[7] = spare_ptr->tb7;
 
-	result = yaffs_check_tags_ecc(tagsPtr);
+	result = yaffs_check_tags_ecc(tags_ptr);
 	if (result > 0)
 		dev->n_tags_ecc_fixed++;
 	else if (result < 0)
 		dev->n_tags_ecc_unfixed++;
 }
 
-static void yaffs_spare_init(yaffs_spare *spare)
+static void yaffs_spare_init(struct yaffs_spare *spare)
 {
-	memset(spare, 0xFF, sizeof(yaffs_spare));
+	memset(spare, 0xFF, sizeof(struct yaffs_spare));
 }
 
-static int yaffs_wr_nand(struct yaffs_dev_s *dev,
-				int nand_chunk, const __u8 *data,
-				yaffs_spare *spare)
+static int yaffs_wr_nand(struct yaffs_dev *dev,
+			 int nand_chunk, const u8 * data,
+			 struct yaffs_spare *spare)
 {
 	if (nand_chunk < dev->param.start_block * dev->param.chunks_per_block) {
 		T(YAFFS_TRACE_ERROR,
@@ -174,36 +166,38 @@ static int yaffs_wr_nand(struct yaffs_dev_s *dev,
 	return dev->param.write_chunk_fn(dev, nand_chunk, data, spare);
 }
 
-static int yaffs_rd_chunk_nand(struct yaffs_dev_s *dev,
-				   int nand_chunk,
-				   __u8 *data,
-				   yaffs_spare *spare,
-				   yaffs_ecc_result *ecc_result,
-				   int doErrorCorrection)
+static int yaffs_rd_chunk_nand(struct yaffs_dev *dev,
+			       int nand_chunk,
+			       u8 * data,
+			       struct yaffs_spare *spare,
+			       enum yaffs_ecc_result *ecc_result,
+			       int correct_errors)
 {
-	int retVal;
-	yaffs_spare localSpare;
+	int ret_val;
+	struct yaffs_spare local_spare;
 
 	if (!spare && data) {
 		/* If we don't have a real spare, then we use a local one. */
 		/* Need this for the calculation of the ecc */
-		spare = &localSpare;
+		spare = &local_spare;
 	}
 
 	if (!dev->param.use_nand_ecc) {
-		retVal = dev->param.read_chunk_fn(dev, nand_chunk, data, spare);
-		if (data && doErrorCorrection) {
+		ret_val =
+		    dev->param.read_chunk_fn(dev, nand_chunk, data, spare);
+		if (data && correct_errors) {
 			/* Do ECC correction */
 			/* Todo handle any errors */
 			int ecc_result1, ecc_result2;
-			__u8 calcEcc[3];
+			u8 calc_ecc[3];
 
-			yaffs_ecc_cacl(data, calcEcc);
+			yaffs_ecc_cacl(data, calc_ecc);
 			ecc_result1 =
-			    yaffs_ecc_correct(data, spare->ecc1, calcEcc);
-			yaffs_ecc_cacl(&data[256], calcEcc);
+			    yaffs_ecc_correct(data, spare->ecc1, calc_ecc);
+			yaffs_ecc_cacl(&data[256], calc_ecc);
 			ecc_result2 =
-			    yaffs_ecc_correct(&data[256], spare->ecc2, calcEcc);
+			    yaffs_ecc_correct(&data[256], spare->ecc2,
+					      calc_ecc);
 
 			if (ecc_result1 > 0) {
 				T(YAFFS_TRACE_ERROR,
@@ -252,10 +246,11 @@ static int yaffs_rd_chunk_nand(struct yaffs_dev_s *dev,
 
 		memset(&nspare, 0, sizeof(nspare));
 
-		retVal = dev->param.read_chunk_fn(dev, nand_chunk, data,
-					(yaffs_spare *) &nspare);
-		memcpy(spare, &nspare, sizeof(yaffs_spare));
-		if (data && doErrorCorrection) {
+		ret_val = dev->param.read_chunk_fn(dev, nand_chunk, data,
+						   (struct yaffs_spare *)
+						   &nspare);
+		memcpy(spare, &nspare, sizeof(struct yaffs_spare));
+		if (data && correct_errors) {
 			if (nspare.eccres1 > 0) {
 				T(YAFFS_TRACE_ERROR,
 				  (TSTR
@@ -294,47 +289,21 @@ static int yaffs_rd_chunk_nand(struct yaffs_dev_s *dev,
 
 		}
 	}
-	return retVal;
+	return ret_val;
 }
 
-#ifdef NOTYET
-static int yaffs_check_chunk_erased(struct yaffs_dev_s *dev,
-				  int nand_chunk)
-{
-	static int init;
-	static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
-	static __u8 data[YAFFS_BYTES_PER_CHUNK];
-	/* Might as well always allocate the larger size for */
-	/* dev->param.use_nand_ecc == true; */
-	static __u8 spare[sizeof(struct yaffs_nand_spare)];
-
-	dev->param.read_chunk_fn(dev, nand_chunk, data, (yaffs_spare *) spare);
-
-	if (!init) {
-		memset(cmpbuf, 0xff, YAFFS_BYTES_PER_CHUNK);
-		init = 1;
-	}
-
-	if (memcmp(cmpbuf, data, YAFFS_BYTES_PER_CHUNK))
-		return YAFFS_FAIL;
-	if (memcmp(cmpbuf, spare, 16))
-		return YAFFS_FAIL;
-
-	return YAFFS_OK;
-
-}
-#endif
-
 /*
  * Functions for robustisizing
  */
 
-static void yaffs_handle_rd_data_error(yaffs_dev_t *dev, int nand_chunk)
+static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk)
 {
 	int flash_block = nand_chunk / dev->param.chunks_per_block;
 
 	/* Mark the block for retirement */
-	yaffs_get_block_info(dev, flash_block + dev->block_offset)->needs_retiring = 1;
+	yaffs_get_block_info(dev,
+			     flash_block + dev->block_offset)->needs_retiring =
+	    1;
 	T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
 	  (TSTR("**>>Block %d marked for retirement" TENDSTR), flash_block));
 
@@ -345,82 +314,29 @@ static void yaffs_handle_rd_data_error(yaffs_dev_t *dev, int nand_chunk)
 	 */
 }
 
-#ifdef NOTYET
-static void yaffs_check_written_block(yaffs_dev_t *dev, int nand_chunk)
+int yaffs_tags_compat_wr(struct yaffs_dev *dev,
+			 int nand_chunk,
+			 const u8 * data, const struct yaffs_ext_tags *ext_tags)
 {
-}
-
-static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk,
-				     const __u8 *data,
-				     const yaffs_spare *spare)
-{
-}
-
-static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk,
-				    const yaffs_spare *spare)
-{
-}
-
-static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk)
-{
-	int flash_block = nand_chunk / dev->param.chunks_per_block;
-
-	/* Mark the block for retirement */
-	yaffs_get_block_info(dev, flash_block)->needs_retiring = 1;
-	/* Delete the chunk */
-	yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
-}
-
-static int yaffs_verify_cmp(const __u8 *d0, const __u8 *d1,
-			       const yaffs_spare *s0, const yaffs_spare *s1)
-{
-
-	if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-	    s0->tb0 != s1->tb0 ||
-	    s0->tb1 != s1->tb1 ||
-	    s0->tb2 != s1->tb2 ||
-	    s0->tb3 != s1->tb3 ||
-	    s0->tb4 != s1->tb4 ||
-	    s0->tb5 != s1->tb5 ||
-	    s0->tb6 != s1->tb6 ||
-	    s0->tb7 != s1->tb7 ||
-	    s0->ecc1[0] != s1->ecc1[0] ||
-	    s0->ecc1[1] != s1->ecc1[1] ||
-	    s0->ecc1[2] != s1->ecc1[2] ||
-	    s0->ecc2[0] != s1->ecc2[0] ||
-	    s0->ecc2[1] != s1->ecc2[1] || s0->ecc2[2] != s1->ecc2[2]) {
-		return 0;
-	}
-
-	return 1;
-}
-#endif				/* NOTYET */
-
-int yaffs_tags_compat_wr(yaffs_dev_t *dev,
-						int nand_chunk,
-						const __u8 *data,
-						const yaffs_ext_tags *eTags)
-{
-	yaffs_spare spare;
-	yaffs_tags_t tags;
+	struct yaffs_spare spare;
+	struct yaffs_tags tags;
 
 	yaffs_spare_init(&spare);
 
-	if (eTags->is_deleted)
+	if (ext_tags->is_deleted)
 		spare.page_status = 0;
 	else {
-		tags.obj_id = eTags->obj_id;
-		tags.chunk_id = eTags->chunk_id;
+		tags.obj_id = ext_tags->obj_id;
+		tags.chunk_id = ext_tags->chunk_id;
 
-		tags.n_bytes_lsb = eTags->n_bytes & 0x3ff;
+		tags.n_bytes_lsb = ext_tags->n_bytes & 0x3ff;
 
 		if (dev->data_bytes_per_chunk >= 1024)
-			tags.n_bytes_msb = (eTags->n_bytes >> 10) & 3;
+			tags.n_bytes_msb = (ext_tags->n_bytes >> 10) & 3;
 		else
 			tags.n_bytes_msb = 3;
 
-
-		tags.serial_number = eTags->serial_number;
+		tags.serial_number = ext_tags->serial_number;
 
 		if (!dev->param.use_nand_ecc && data)
 			yaffs_calc_ecc(data, &spare);
@@ -432,51 +348,51 @@ int yaffs_tags_compat_wr(yaffs_dev_t *dev,
 	return yaffs_wr_nand(dev, nand_chunk, data, &spare);
 }
 
-int yaffs_tags_compat_rd(yaffs_dev_t *dev,
-						     int nand_chunk,
-						     __u8 *data,
-						     yaffs_ext_tags *eTags)
+int yaffs_tags_compat_rd(struct yaffs_dev *dev,
+			 int nand_chunk,
+			 u8 * data, struct yaffs_ext_tags *ext_tags)
 {
 
-	yaffs_spare spare;
-	yaffs_tags_t tags;
-	yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
+	struct yaffs_spare spare;
+	struct yaffs_tags tags;
+	enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
 
-	static yaffs_spare spareFF;
+	static struct yaffs_spare spare_ff;
 	static int init;
 
 	if (!init) {
-		memset(&spareFF, 0xFF, sizeof(spareFF));
+		memset(&spare_ff, 0xFF, sizeof(spare_ff));
 		init = 1;
 	}
 
-	if (yaffs_rd_chunk_nand
-	    (dev, nand_chunk, data, &spare, &ecc_result, 1)) {
-		/* eTags may be NULL */
-		if (eTags) {
+	if (yaffs_rd_chunk_nand(dev, nand_chunk, data, &spare, &ecc_result, 1)) {
+		/* ext_tags may be NULL */
+		if (ext_tags) {
 
 			int deleted =
 			    (yaffs_count_bits(spare.page_status) < 7) ? 1 : 0;
 
-			eTags->is_deleted = deleted;
-			eTags->ecc_result = ecc_result;
-			eTags->block_bad = 0;	/* We're reading it */
+			ext_tags->is_deleted = deleted;
+			ext_tags->ecc_result = ecc_result;
+			ext_tags->block_bad = 0;	/* We're reading it */
 			/* therefore it is not a bad block */
-			eTags->chunk_used =
-			    (memcmp(&spareFF, &spare, sizeof(spareFF)) !=
+			ext_tags->chunk_used =
+			    (memcmp(&spare_ff, &spare, sizeof(spare_ff)) !=
 			     0) ? 1 : 0;
 
-			if (eTags->chunk_used) {
+			if (ext_tags->chunk_used) {
 				yaffs_get_tags_from_spare(dev, &spare, &tags);
 
-				eTags->obj_id = tags.obj_id;
-				eTags->chunk_id = tags.chunk_id;
-				eTags->n_bytes = tags.n_bytes_lsb;
+				ext_tags->obj_id = tags.obj_id;
+				ext_tags->chunk_id = tags.chunk_id;
+				ext_tags->n_bytes = tags.n_bytes_lsb;
 
 				if (dev->data_bytes_per_chunk >= 1024)
-					eTags->n_bytes |= (((unsigned) tags.n_bytes_msb) << 10);
+					ext_tags->n_bytes |=
+					    (((unsigned)tags.
+					      n_bytes_msb) << 10);
 
-				eTags->serial_number = tags.serial_number;
+				ext_tags->serial_number = tags.serial_number;
 			}
 		}
 
@@ -486,51 +402,50 @@ int yaffs_tags_compat_rd(yaffs_dev_t *dev,
 	}
 }
 
-int yaffs_tags_compat_mark_bad(struct yaffs_dev_s *dev,
-					    int flash_block)
+int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int flash_block)
 {
 
-	yaffs_spare spare;
+	struct yaffs_spare spare;
 
-	memset(&spare, 0xff, sizeof(yaffs_spare));
+	memset(&spare, 0xff, sizeof(struct yaffs_spare));
 
 	spare.block_status = 'Y';
 
 	yaffs_wr_nand(dev, flash_block * dev->param.chunks_per_block, NULL,
-			       &spare);
+		      &spare);
 	yaffs_wr_nand(dev, flash_block * dev->param.chunks_per_block + 1,
-			       NULL, &spare);
+		      NULL, &spare);
 
 	return YAFFS_OK;
 
 }
 
-int yaffs_tags_compat_query_block(struct yaffs_dev_s *dev,
-					  int block_no,
-					  yaffs_block_state_t *state,
-					  __u32 *seq_number)
+int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
+				  int block_no,
+				  enum yaffs_block_state *state,
+				  u32 * seq_number)
 {
 
-	yaffs_spare spare0, spare1;
-	static yaffs_spare spareFF;
+	struct yaffs_spare spare0, spare1;
+	static struct yaffs_spare spare_ff;
 	static int init;
-	yaffs_ecc_result dummy;
+	enum yaffs_ecc_result dummy;
 
 	if (!init) {
-		memset(&spareFF, 0xFF, sizeof(spareFF));
+		memset(&spare_ff, 0xFF, sizeof(spare_ff));
 		init = 1;
 	}
 
 	*seq_number = 0;
 
 	yaffs_rd_chunk_nand(dev, block_no * dev->param.chunks_per_block, NULL,
-				&spare0, &dummy, 1);
-	yaffs_rd_chunk_nand(dev, block_no * dev->param.chunks_per_block + 1, NULL,
-				&spare1, &dummy, 1);
+			    &spare0, &dummy, 1);
+	yaffs_rd_chunk_nand(dev, block_no * dev->param.chunks_per_block + 1,
+			    NULL, &spare1, &dummy, 1);
 
 	if (yaffs_count_bits(spare0.block_status & spare1.block_status) < 7)
 		*state = YAFFS_BLOCK_STATE_DEAD;
-	else if (memcmp(&spareFF, &spare0, sizeof(spareFF)) == 0)
+	else if (memcmp(&spare_ff, &spare0, sizeof(spare_ff)) == 0)
 		*state = YAFFS_BLOCK_STATE_EMPTY;
 	else
 		*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;