Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

[yaffs2.git] / yaffs_packedtags2.c

diff --git a/yaffs_packedtags2.c b/yaffs_packedtags2.c
index 6c12aed2b9ddabfe3ae7ffe8641553c7520eb10e..2bb31b0707e49e39538aab5577c6dabf47075281 100644 (file)
--- a/yaffs_packedtags2.c
+++ b/yaffs_packedtags2.c
@@ -38,12 +38,12 @@
 #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 struct
-                                             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 struct yaffs_packed_tags2 *pt)
@@ -53,12 +53,11 @@ static void yaffs_dump_packed_tags2(const struct yaffs_packed_tags2 *pt)
 
 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);
 
 }
 
@@ -109,9 +108,7 @@ void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt,
 void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
                                  struct yaffs_packed_tags2_tags_only *ptt)
 {
-
        memset(t, 0, sizeof(struct yaffs_ext_tags));
-
        yaffs_init_tags(t);
 
        if (ptt->seq_number != 0xFFFFFFFF) {
@@ -125,7 +122,6 @@ void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
                t->seq_number = ptt->seq_number;
 
                /* Do extra header info stuff */
-
                if (ptt->chunk_id & EXTRA_HEADER_INFO_FLAG) {
                        t->chunk_id = 0;
                        t->n_bytes = 0;
@@ -147,16 +143,13 @@ void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t,
                                t->extra_length = ptt->n_bytes;
                }
        }
-
        yaffs_dump_packed_tags2_tags_only(ptt);
        yaffs_dump_tags2(t);
-
 }
 
 void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
                        int tags_ecc)
 {
-
        enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
 
        if (pt->t.seq_number != 0xFFFFFFFF && tags_ecc) {
@@ -165,14 +158,12 @@ void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
                struct yaffs_ecc_other ecc;
                int result;
                yaffs_ecc_calc_other((unsigned char *)&pt->t,
-                                    sizeof(struct
-                                           yaffs_packed_tags2_tags_only),
-                                    &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);
+                               sizeof(struct yaffs_packed_tags2_tags_only),
+                               &pt->ecc, &ecc);
                switch (result) {
                case 0:
                        ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
@@ -187,7 +178,6 @@ void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt,
                        ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
                }
        }
-
        yaffs_unpack_tags2_tags_only(t, &pt->t);
 
        t->ecc_result = ecc_result;