Fix M18 driver for 64-bit systems

[yaffs2.git] / yaffs_packedtags1.c

diff --git a/yaffs_packedtags1.c b/yaffs_packedtags1.c
index 2ce873f631e0bb741d01becd5a339670b6fcd952..dd9a331d8fc41e3dad052e75541f17bfc786b312 100644 (file)
--- a/yaffs_packedtags1.c
+++ b/yaffs_packedtags1.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -14,7 +14,16 @@
 #include "yaffs_packedtags1.h"
 #include "yportenv.h"
 
-void yaffs_pack_tags1(yaffs_packed_tags1 *pt, const yaffs_ext_tags *t)
+static const u8 all_ff[20] = {
+       0xff, 0xff, 0xff, 0xff,
+       0xff, 0xff, 0xff, 0xff,
+       0xff, 0xff, 0xff, 0xff,
+       0xff, 0xff, 0xff, 0xff,
+       0xff, 0xff, 0xff, 0xff
+};
+
+void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt,
+                     const struct yaffs_ext_tags *t)
 {
        pt->chunk_id = t->chunk_id;
        pt->serial_number = t->serial_number;
@@ -23,19 +32,16 @@ void yaffs_pack_tags1(yaffs_packed_tags1 *pt, const yaffs_ext_tags *t)
        pt->ecc = 0;
        pt->deleted = (t->is_deleted) ? 0 : 1;
        pt->unused_stuff = 0;
-       pt->should_be_ff = 0xFFFFFFFF;
-
+       pt->should_be_ff = 0xffffffff;
 }
 
-void yaffs_unpack_tags1(yaffs_ext_tags *t, const yaffs_packed_tags1 *pt)
+void yaffs_unpack_tags1(struct yaffs_ext_tags *t,
+                       const struct yaffs_packed_tags1 *pt)
 {
-       static const __u8 all_ff[] =
-           { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0xff };
 
-       if (memcmp(all_ff, pt, sizeof(yaffs_packed_tags1))) {
+       if (memcmp(all_ff, pt, sizeof(struct yaffs_packed_tags1))) {
                t->block_bad = 0;
-               if (pt->should_be_ff != 0xFFFFFFFF)
+               if (pt->should_be_ff != 0xffffffff)
                        t->block_bad = 1;
                t->chunk_used = 1;
                t->obj_id = pt->obj_id;
@@ -45,6 +51,6 @@ void yaffs_unpack_tags1(yaffs_ext_tags *t, const yaffs_packed_tags1 *pt)
                t->is_deleted = (pt->deleted) ? 0 : 1;
                t->serial_number = pt->serial_number;
        } else {
-               memset(t, 0, sizeof(yaffs_ext_tags));
+               memset(t, 0, sizeof(struct yaffs_ext_tags));
        }
 }