X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=yaffs_packedtags2.c;h=da1621fa81963c82feb9585c657a8b7afc233e6f;hb=17b102ed84b24f9c45ebdba39cacc73eb39e8cae;hp=957ed8bf0e5b19ee73fb36a72beda062a36175d9;hpb=e8cfe05cf0d057f6978c37943e51b17bb14664e3;p=yaffs2.git

diff --git a/yaffs_packedtags2.c b/yaffs_packedtags2.c
index 957ed8b..da1621f 100644
--- a/yaffs_packedtags2.c
+++ b/yaffs_packedtags2.c
@@ -38,19 +38,19 @@
 #define EXTRA_OBJECT_TYPE_MASK  ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT)
 
 
-static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart * ptt)
+static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt)
 {
 	T(YAFFS_TRACE_MTD,
 	  (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR),
 	   ptt->objectId, ptt->chunkId, ptt->byteCount,
 	   ptt->sequenceNumber));
 }
-static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 * pt)
+static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt)
 {
 	yaffs_DumpPackedTags2TagsPart(&pt->t);
 }
 
-static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
+static void yaffs_DumpTags2(const yaffs_ExtendedTags *t)
 {
 	T(YAFFS_TRACE_MTD,
 	  (TSTR
@@ -61,7 +61,8 @@ static void yaffs_DumpTags2(const yaffs_ExtendedTags * t)
 
 }
 
-void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart * ptt, const yaffs_ExtendedTags * t)
+void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt,
+		const yaffs_ExtendedTags *t)
 {
 	ptt->chunkId = t->chunkId;
 	ptt->sequenceNumber = t->sequenceNumber;
@@ -98,9 +99,9 @@ void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart * ptt, const yaffs_Extend
 }
 
 
-void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
+void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t)
 {
-	yaffs_PackTags2TagsPart(&pt->t,t);
+	yaffs_PackTags2TagsPart(&pt->t, t);
 
 #ifndef YAFFS_IGNORE_TAGS_ECC
 	{
@@ -112,7 +113,8 @@ void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t)
 }
 
 
-void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags * t, yaffs_PackedTags2TagsPart * ptt)
+void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t,
+		yaffs_PackedTags2TagsPart *ptt)
 {
 
 	memset(t, 0, sizeof(yaffs_ExtendedTags));
@@ -160,18 +162,14 @@ void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags * t, yaffs_PackedTags2TagsPart
 }
 
 
-void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
+void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt)
 {
 
-	yaffs_UnpackTags2TagsPart(t,&pt->t);
+	yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR;
 
 	if (pt->t.sequenceNumber != 0xFFFFFFFF) {
 		/* Page is in use */
-#ifdef YAFFS_IGNORE_TAGS_ECC
-		{
-			t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-		}
-#else
+#ifndef YAFFS_IGNORE_TAGS_ECC
 		{
 			yaffs_ECCOther ecc;
 			int result;
@@ -184,23 +182,27 @@ void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt)
 						  sizeof
 						  (yaffs_PackedTags2TagsPart),
 						  &pt->ecc, &ecc);
-			switch(result){
-				case 0:
-					t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-					break;
-				case 1:
-					t->eccResult = YAFFS_ECC_RESULT_FIXED;
-					break;
-				case -1:
-					t->eccResult = YAFFS_ECC_RESULT_UNFIXED;
-					break;
-				default:
-					t->eccResult = YAFFS_ECC_RESULT_UNKNOWN;
+			switch (result) {
+			case 0:
+				eccResult = YAFFS_ECC_RESULT_NO_ERROR;
+				break;
+			case 1:
+				eccResult = YAFFS_ECC_RESULT_FIXED;
+				break;
+			case -1:
+				eccResult = YAFFS_ECC_RESULT_UNFIXED;
+				break;
+			default:
+				eccResult = YAFFS_ECC_RESULT_UNKNOWN;
 			}
 		}
 #endif
 	}
 
+	yaffs_UnpackTags2TagsPart(t, &pt->t);
+
+	t->eccResult = eccResult;
+
 	yaffs_DumpPackedTags2(pt);
 	yaffs_DumpTags2(t);