Mods for Linux 3.0 and fix a typo

[yaffs2.git] / yaffs_packedtags1.h

diff --git a/yaffs_packedtags1.h b/yaffs_packedtags1.h
index 5f6766862444fa2cc518b962a799dd405b11349c..b80f0a5b15740f0e38deabd18400aef65667d470 100644 (file)
--- a/yaffs_packedtags1.h
+++ b/yaffs_packedtags1.h
@@ -1,28 +1,39 @@
-// This is used to pack YAFFS1 tags, not YAFFS2 tags.
+/*
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 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 Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ */
+
+/* This is used to pack YAFFS1 tags, not YAFFS2 tags. */
 
 #ifndef __YAFFS_PACKEDTAGS1_H__
 #define __YAFFS_PACKEDTAGS1_H__
 
-
 #include "yaffs_guts.h"
 
-typedef struct
-{   
-    unsigned chunkId:20;
-    unsigned serialNumber:2;
-    unsigned byteCount:10;
-    unsigned objectId:18;
-    unsigned ecc:12;
-    unsigned deleted:1;
-    unsigned unusedStuff:1;
-    unsigned shouldBeFF;
-
-} yaffs_PackedTags1;
-
-
-
-void yaffs_PackTags1(yaffs_PackedTags1 *pt, yaffs_ExtendedTags *t);
-void yaffs_UnpackTags1(yaffs_ExtendedTags *t, yaffs_PackedTags1 *pt);
+struct yaffs_packed_tags1 {
+       unsigned chunk_id:20;
+       unsigned serial_number:2;
+       unsigned n_bytes:10;
+       unsigned obj_id:18;
+       unsigned ecc:12;
+       unsigned deleted:1;
+       unsigned unused_stuff:1;
+       unsigned should_be_ff;
+
+};
+
+void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt,
+                     const struct yaffs_ext_tags *t);
+void yaffs_unpack_tags1(struct yaffs_ext_tags *t,
+                       const struct yaffs_packed_tags1 *pt);
 #endif
-
-