X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_packedtags2.c;h=8e7fea3d286037ffc08b6745012873afce4ed046;hp=20f0d78ddb869aa47de1ea5882de7daad28fb9af;hb=8cbfc1e273db791447911631e80c0495c6171ca8;hpb=976dbeae825b18e6759f3903073a6784248cc244

diff --git a/yaffs_packedtags2.c b/yaffs_packedtags2.c
index 20f0d78..8e7fea3 100644
--- a/yaffs_packedtags2.c
+++ b/yaffs_packedtags2.c
@@ -38,32 +38,31 @@
 #define EXTRA_OBJECT_TYPE_SHIFT (28)
 #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
 
-
-static void yaffs_dump_packed_tags2_tags_only(const yaffs_packed_tags2_tags_only *ptt)
+static void yaffs_dump_packed_tags2_tags_only(const struct
+					      yaffs_packed_tags2_tags_only *ptt)
 {
-	T(YAFFS_TRACE_MTD,
-	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
-	   ptt->obj_id, ptt->chunk_id, ptt->n_bytes,
-	   ptt->seq_number));
+	yaffs_trace(YAFFS_TRACE_MTD,
+		"packed tags obj %d chunk %d byte %d seq %d",
+		ptt->obj_id, ptt->chunk_id, ptt->n_bytes, ptt->seq_number);
 }
-static void yaffs_dump_packed_tags2(const yaffs_packed_tags2 *pt)
+
+static void yaffs_dump_packed_tags2(const struct yaffs_packed_tags2 *pt)
 {
 	yaffs_dump_packed_tags2_tags_only(&pt->t);
 }
 
 static void yaffs_dump_tags2(const struct yaffs_ext_tags *t)
 {
-	T(YAFFS_TRACE_MTD,
-	  (TSTR
-	   ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d"
-	    TENDSTR), t->ecc_result, t->block_bad, t->chunk_used, t->obj_id,
-	   t->chunk_id, t->n_bytes, t->is_deleted, t->serial_number,
-	   t->seq_number));
+	yaffs_trace(YAFFS_TRACE_MTD,
+		"ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d",
+		t->ecc_result, t->block_bad, t->chunk_used, t->obj_id,
+		t->chunk_id, t->n_bytes, t->is_deleted, t->serial_number,
+		t->seq_number);
 
 }
 
-void yaffs_pack_tags2_tags_only(yaffs_packed_tags2_tags_only *ptt,
-		const struct yaffs_ext_tags *t)
+void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *ptt,
+				const struct yaffs_ext_tags *t)
 {
 	ptt->chunk_id = t->chunk_id;
 	ptt->seq_number = t->seq_number;
@@ -73,16 +72,14 @@ void yaffs_pack_tags2_tags_only(yaffs_packed_tags2_tags_only *ptt,
 	if (t->chunk_id == 0 && t->extra_available) {
 		/* Store the extra header info instead */
 		/* We save the parent object in the chunk_id */
-		ptt->chunk_id = EXTRA_HEADER_INFO_FLAG
-			| t->extra_parent_id;
+		ptt->chunk_id = EXTRA_HEADER_INFO_FLAG | t->extra_parent_id;
 		if (t->extra_is_shrink)
 			ptt->chunk_id |= EXTRA_SHRINK_FLAG;
 		if (t->extra_shadows)
 			ptt->chunk_id |= EXTRA_SHADOWS_FLAG;
 
 		ptt->obj_id &= ~EXTRA_OBJECT_TYPE_MASK;
-		ptt->obj_id |=
-		    (t->extra_obj_type << EXTRA_OBJECT_TYPE_SHIFT);
+		ptt->obj_id |= (t->extra_obj_type << EXTRA_OBJECT_TYPE_SHIFT);
 
 		if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK)
 			ptt->n_bytes = t->extra_equiv_id;
@@ -96,20 +93,20 @@ void yaffs_pack_tags2_tags_only(yaffs_packed_tags2_tags_only *ptt,
 	yaffs_dump_tags2(t);
 }
 
-
-void yaffs_pack_tags2(yaffs_packed_tags2 *pt, const struct yaffs_ext_tags *t, int tags_ecc)
+void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt,
+		      const struct yaffs_ext_tags *t, int tags_ecc)
 {
 	yaffs_pack_tags2_tags_only(&pt->t, t);
 
-	if(tags_ecc)
+	if (tags_ecc)
 		yaffs_ecc_calc_other((unsigned char *)&pt->t,
-					sizeof(yaffs_packed_tags2_tags_only),
-					&pt->ecc);
+				     sizeof(struct
+					    yaffs_packed_tags2_tags_only),
+				     &pt->ecc);
 }
 
-
 void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
-		yaffs_packed_tags2_tags_only *ptt)
+				  struct yaffs_packed_tags2_tags_only *ptt)
 {
 
 	memset(t, 0, sizeof(struct yaffs_ext_tags));
@@ -155,36 +152,38 @@ void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
 
 }
 
-
-void yaffs_unpack_tags2(struct yaffs_ext_tags *t, yaffs_packed_tags2 *pt, int tags_ecc)
+void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
+			int tags_ecc)
 {
 
-	yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+	enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
 
-	if (pt->t.seq_number != 0xFFFFFFFF &&
-	    tags_ecc){
+	if (pt->t.seq_number != 0xFFFFFFFF && tags_ecc) {
 		/* Chunk is in use and we need to do ECC */
-		
-		yaffs_ecc_other ecc;
+
+		struct yaffs_ecc_other ecc;
 		int result;
 		yaffs_ecc_calc_other((unsigned char *)&pt->t,
-					sizeof(yaffs_packed_tags2_tags_only),
-					&ecc);
-		result = yaffs_ecc_correct_other((unsigned char *)&pt->t,
-						sizeof(yaffs_packed_tags2_tags_only),
-						&pt->ecc, &ecc);
+				     sizeof(struct
+					    yaffs_packed_tags2_tags_only),
+				     &ecc);
+		result =
+		    yaffs_ecc_correct_other((unsigned char *)&pt->t,
+					    sizeof(struct
+						   yaffs_packed_tags2_tags_only),
+					    &pt->ecc, &ecc);
 		switch (result) {
-			case 0:
-				ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
-				break;
-			case 1:
-				ecc_result = YAFFS_ECC_RESULT_FIXED;
-				break;
-			case -1:
-				ecc_result = YAFFS_ECC_RESULT_UNFIXED;
-				break;
-			default:
-				ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
+		case 0:
+			ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+			break;
+		case 1:
+			ecc_result = YAFFS_ECC_RESULT_FIXED;
+			break;
+		case -1:
+			ecc_result = YAFFS_ECC_RESULT_UNFIXED;
+			break;
+		default:
+			ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
 		}
 	}
 
@@ -195,4 +194,3 @@ void yaffs_unpack_tags2(struct yaffs_ext_tags *t, yaffs_packed_tags2 *pt, int ta
 	yaffs_dump_packed_tags2(pt);
 	yaffs_dump_tags2(t);
 }
-