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

[yaffs2.git] / yaffs_packedtags1.c

diff --git a/yaffs_packedtags1.c b/yaffs_packedtags1.c
index 920fed2b56d11b6549ac1d2bcabec0ea6b822680..3e67e69166663feeb76871b6307b01bf80e9773f 100644 (file)
--- a/yaffs_packedtags1.c
+++ b/yaffs_packedtags1.c
@@ -1,7 +1,20 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2007 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
 #include "yaffs_packedtags1.h"
 #include "yportenv.h"
 
-void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
 {
        pt->chunkId = t->chunkId;
        pt->serialNumber = t->serialNumber;
@@ -14,7 +27,7 @@ void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t)
 
 }
 
-void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
+void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
 {
        static const __u8 allFF[] =
            { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -22,9 +35,8 @@ void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
 
        if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
                t->blockBad = 0;
-               if (pt->shouldBeFF != 0xFFFFFFFF) {
+               if (pt->shouldBeFF != 0xFFFFFFFF)
                        t->blockBad = 1;
-               }
                t->chunkUsed = 1;
                t->objectId = pt->objectId;
                t->chunkId = pt->chunkId;
@@ -34,6 +46,5 @@ void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt)
                t->serialNumber = pt->serialNumber;
        } else {
                memset(t, 0, sizeof(yaffs_ExtendedTags));
-
        }
 }