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 018eacf99d7671bbe61c1626f91fae3f402672ad..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, yaffs_ExtendedTags *t)
+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
 {
        pt->chunkId = t->chunkId;
        pt->serialNumber = t->serialNumber;
@@ -11,32 +24,27 @@ void yaffs_PackTags1(yaffs_PackedTags1 *pt, yaffs_ExtendedTags *t)
        pt->deleted = (t->chunkDeleted) ? 0 : 1;
        pt->unusedStuff = 0;
        pt->shouldBeFF = 0xFFFFFFFF;
-       
+
 }
 
-void yaffs_UnpackTags1(yaffs_ExtendedTags *t, 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, 0xff};
-       
-       if(memcmp(allFF,pt,sizeof(yaffs_PackedTags1)))
-       {
+       static const __u8 allFF[] =
+           { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+0xff };
+
+       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;
                t->byteCount = pt->byteCount;
-               t->eccResult =  YAFFS_ECC_RESULT_NO_ERROR;
+               t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
                t->chunkDeleted = (pt->deleted) ? 0 : 1;
                t->serialNumber = pt->serialNumber;
-       }
-       else
-       {
-               memset(t,0,sizeof(yaffs_ExtendedTags));
-               
+       } else {
+               memset(t, 0, sizeof(yaffs_ExtendedTags));
        }
 }
-