Updated headers so they really are the same

diff --git a/direct/dtest.c b/direct/dtest.c
index 66b8db1d43f8fde54da682c4fc7c4212d51f596b..b9391b8b8a4b0ffb60c6fb8b9dab2915c9e282b9 100644 (file)
--- a/direct/dtest.c
+++ b/direct/dtest.c
@@ -9,7 +9,6 @@
  * 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.
  * 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.

- *

  */
 
 /*
  */
 
 /*

diff --git a/direct/yaffs_fileem.c b/direct/yaffs_fileem.c
index 98af7eec181b0378da7e2f37da2c398d685b093a..30128d9d4cc675ab47d2a98f8e5857eae0d671c4 100644 (file)
--- a/direct/yaffs_fileem.c
+++ b/direct/yaffs_fileem.c
@@ -9,7 +9,6 @@
  * 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.
  * 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.

- *

  */
 
 /*
  */
 
 /*


@@ -17,7 +16,7 @@
  * This is only intended as test code to test persistence etc.
  */
 
  * This is only intended as test code to test persistence etc.
  */
 

-const char *yaffs_flashif_c_version = "$Id: yaffs_fileem.c,v 1.2 2007-02-12 16:49:50 wookey Exp $";
+const char *yaffs_flashif_c_version = "$Id: yaffs_fileem.c,v 1.3 2007-02-14 01:09:06 wookey Exp $";

 
 
 #include "yportenv.h"
 
 
 #include "yportenv.h"

diff --git a/direct/yaffs_fileem2k.c b/direct/yaffs_fileem2k.c
index 934d90d60addf46e3cc0ed891fcacb078dfa9ea7..1e2cd6b3ef59156d9b4fbb26824414415ebf1a2e 100644 (file)
--- a/direct/yaffs_fileem2k.c
+++ b/direct/yaffs_fileem2k.c
@@ -9,7 +9,6 @@
  * 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.
  * 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.

- *

  */
 
 /*
  */
 
 /*


@@ -17,7 +16,7 @@
  * This is only intended as test code to test persistence etc.
  */
 
  * This is only intended as test code to test persistence etc.
  */
 

-const char *yaffs_flashif_c_version = "$Id: yaffs_fileem2k.c,v 1.11 2007-02-12 16:49:50 wookey Exp $";
+const char *yaffs_flashif_c_version = "$Id: yaffs_fileem2k.c,v 1.12 2007-02-14 01:09:06 wookey Exp $";

 
 
 #include "yportenv.h"
 
 
 #include "yportenv.h"

diff --git a/direct/yaffs_flashif.c b/direct/yaffs_flashif.c
index 5da0670d349447c295f804308af6698feda58a32..cea57e90d3d4f4f4b06803d91b748d40a3650238 100644 (file)
--- a/direct/yaffs_flashif.c
+++ b/direct/yaffs_flashif.c
@@ -9,11 +9,10 @@
  * 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.
  * 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.

- *

  */
 
 
  */
 
 

-const char *yaffs_flashif_c_version = "$Id: yaffs_flashif.c,v 1.2 2007-02-12 16:49:50 wookey Exp $";
+const char *yaffs_flashif_c_version = "$Id: yaffs_flashif.c,v 1.3 2007-02-14 01:09:06 wookey Exp $";

 
 
 #include "yportenv.h"
 
 
 #include "yportenv.h"

diff --git a/direct/yaffs_ramdisk.c b/direct/yaffs_ramdisk.c
index bcb44f8b99899249377453677fe515d00721d270..3cf054a8d8b0541a9ea42edf9c3a8bb2d4a3d1ea 100644 (file)
--- a/direct/yaffs_ramdisk.c
+++ b/direct/yaffs_ramdisk.c
@@ -9,7 +9,6 @@
  * 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.
  * 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.

- *

  */
 
 /*
  */
 
 /*


@@ -19,7 +18,7 @@
  * Use this with dev->useNANDECC enabled, then ECC overheads are not required.
  */
 
  * Use this with dev->useNANDECC enabled, then ECC overheads are not required.
  */
 

-const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.3 2007-02-12 16:49:50 wookey Exp $";
+const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.4 2007-02-14 01:09:06 wookey Exp $";

 
 
 #include "yportenv.h"
 
 
 #include "yportenv.h"

diff --git a/direct/yaffs_ramem2k.c b/direct/yaffs_ramem2k.c
index 96fae0bbe883cdc36fe6a292dd588bb9ac584705..c01bc974a5a1488686061690d8e2d4e6aa999bda 100644 (file)
--- a/direct/yaffs_ramem2k.c
+++ b/direct/yaffs_ramem2k.c
@@ -9,7 +9,6 @@
  * 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.
  * 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.

- *

  */
 
 /*
  */
 
 /*


@@ -17,7 +16,7 @@
  */
 
 
  */
 
 

-const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.2 2007-02-12 16:49:50 wookey Exp $";
+const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.3 2007-02-14 01:09:06 wookey Exp $";

 
 #ifndef __KERNEL__
 #define CONFIG_YAFFS_RAM_ENABLED
 
 #ifndef __KERNEL__
 #define CONFIG_YAFFS_RAM_ENABLED

diff --git a/direct/yaffscfg.c b/direct/yaffscfg.c
index 93bb1937d76a9ef0f96ccbf70dc61ba3385fc0f4..380a7270aa5b6d0b0597d986ad470be9f55f368e 100644 (file)
--- a/direct/yaffscfg.c
+++ b/direct/yaffscfg.c
@@ -9,7 +9,6 @@
  * 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.
  * 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.

- *

  */
 
 /*
  */
 
 /*

diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index abc6a21dcbdd1bc667e4642c1c7bedf9f9222a57..9ca4aeaa0cf3032e68c006d29c0bae2cab6684dd 100644 (file)
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -9,7 +9,6 @@
  * 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.
  * 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.

- *

  */
 
 /*
  */
 
 /*

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index bd94a89bb984163ff2d20e7162bde7243d0bcc4b..90046854ff29def2dc975bd03bc38173152d526a 100644 (file)
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -9,7 +9,6 @@
  * 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.
  * 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 "yaffsfs.h"
  */
  
 #include "yaffsfs.h"


@@ -25,7 +24,7 @@
 #endif
 
 
 #endif
 
 

-const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.16 2007-02-12 16:49:50 wookey Exp $";
+const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";

 
 // configurationList is the list of devices that are supported
 static yaffsfs_DeviceConfiguration *yaffsfs_configurationList;
 
 // configurationList is the list of devices that are supported
 static yaffsfs_DeviceConfiguration *yaffsfs_configurationList;

diff --git a/mtdemul/nandemul2k.c b/mtdemul/nandemul2k.c
index 6f10746e3e433f0752c7f5e39b240f517924e841..4d25aaabf08fc0b15d246d98a7c48fac4dbe3b5c 100644 (file)
--- a/mtdemul/nandemul2k.c
+++ b/mtdemul/nandemul2k.c
@@ -1,7 +1,7 @@
 /*
 /*

- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.

  *
  *

- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2007 Aleph One Ltd.

  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>


@@ -9,8 +9,9 @@
  * 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.
  * 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.

- *
- *
+ */
+
+/*

  *  This version hacked for emulating 2kpage NAND for YAFFS2 testing.
  */
 
  *  This version hacked for emulating 2kpage NAND for YAFFS2 testing.
  */
 

diff --git a/utils/mkyaffs2image.c b/utils/mkyaffs2image.c
index 31d41904234e543abcbdb9144596328ce7142251..9939658c852356b4c4671cdba4d5534be89d2a4b 100644 (file)
--- a/utils/mkyaffs2image.c
+++ b/utils/mkyaffs2image.c
@@ -12,7 +12,6 @@
  * 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.
  * 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.

- *

  */
 
 /*
  */
 
 /*


@@ -43,7 +42,7 @@ unsigned yaffs_traceMask=0;
 #define chunkSize 2048
 #define spareSize 64
 
 #define chunkSize 2048
 #define spareSize 64
 

-const char * mkyaffsimage_c_version = "$Id: mkyaffs2image.c,v 1.3 2007-02-12 16:55:27 wookey Exp $";
+const char * mkyaffsimage_c_version = "$Id: mkyaffs2image.c,v 1.4 2007-02-14 01:09:06 wookey Exp $";

 
 
 typedef struct
 
 
 typedef struct

diff --git a/utils/mkyaffsimage.c b/utils/mkyaffsimage.c
index e4c8fc68ee5bbd0ef3f85e7c380aa7b790fccd6e..2b8dc1e919d2b96416157dcdddf9a45876ba2068 100644 (file)
--- a/utils/mkyaffsimage.c
+++ b/utils/mkyaffsimage.c
@@ -11,7 +11,6 @@
  * 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.
  * 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.

- *

  */
 
 /*
  */
 
 /*

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index 0e6f7e1d2e1b564ef27b1da836f88d5f60e4f4a2..2f658e68aadacf37eca09f30e34bb584e018cd5a 100644 (file)
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -9,11 +9,10 @@
  * 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.
  * 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.

- *

  */
 
 const char *yaffs_checkptrw_c_version =
  */
 
 const char *yaffs_checkptrw_c_version =

-    "$Id: yaffs_checkptrw.c,v 1.12 2007-02-12 16:55:25 wookey Exp $";
+    "$Id: yaffs_checkptrw.c,v 1.13 2007-02-14 01:09:06 wookey Exp $";

 
 
 #include "yaffs_checkptrw.h"
 
 
 #include "yaffs_checkptrw.h"

diff --git a/yaffs_ecc.c b/yaffs_ecc.c
index 2eb69bad277f7c24570e563d5032cf4bb9158cfe..be860d01a6f3853695efb2a9184bb43ffe728927 100644 (file)
--- a/yaffs_ecc.c
+++ b/yaffs_ecc.c
@@ -9,18 +9,17 @@
  * 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.
  * 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.

- *

  */
 
  */
 

- /*
-  * This code implements the ECC algorithm used in SmartMedia.
-  *
-  * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes. 
-  * The two unused bit are set to 1.
-  * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC 
-  * blocks are used on a 512-byte NAND page.
-  *
-  */
+/*
+ * This code implements the ECC algorithm used in SmartMedia.
+ *
+ * The ECC comprises 22 bits of parity information and is stuffed into 3 bytes. 
+ * The two unused bit are set to 1.
+ * The ECC can correct single bit errors in a 256-byte page of data. Thus, two such ECC 
+ * blocks are used on a 512-byte NAND page.
+ *
+ */

 
 /* Table generated by gen-ecc.c
  * Using a table means we do not have to calculate p1..p4 and p1'..p4'
 
 /* Table generated by gen-ecc.c
  * Using a table means we do not have to calculate p1..p4 and p1'..p4'


@@ -30,7 +29,7 @@
  */
 
 const char *yaffs_ecc_c_version =
  */
 
 const char *yaffs_ecc_c_version =

-    "$Id: yaffs_ecc.c,v 1.8 2007-02-12 16:55:25 wookey Exp $";
+    "$Id: yaffs_ecc.c,v 1.9 2007-02-14 01:09:06 wookey Exp $";

 
 #include "yportenv.h"
 
 
 #include "yportenv.h"
 

diff --git a/yaffs_fs.c b/yaffs_fs.c
index 57a8c108b7eba87b3776d526076dd634a0523b92..50484423609460f8c224b88088d2ea65c859b34f 100644 (file)
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -16,7 +16,6 @@
  * 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.
  * 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.

- *

  */
 
 /*
  */
 
 /*


@@ -33,7 +32,7 @@
  */
 
 const char *yaffs_fs_c_version =
  */
 
 const char *yaffs_fs_c_version =

-    "$Id: yaffs_fs.c,v 1.57 2007-02-12 16:55:25 wookey Exp $";
+    "$Id: yaffs_fs.c,v 1.58 2007-02-14 01:09:06 wookey Exp $";

 extern const char *yaffs_guts_c_version;
 
 #include <linux/version.h>
 extern const char *yaffs_guts_c_version;
 
 #include <linux/version.h>

diff --git a/yaffs_guts.c b/yaffs_guts.c
index ab22c85e54979803998fb711854a274bfef5c3af..dc435b203b889cb8cd85229f9b8a40c1c176a969 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -9,11 +9,10 @@
  * 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.
  * 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.

- *

  */
 
 const char *yaffs_guts_c_version =
  */
 
 const char *yaffs_guts_c_version =

-    "$Id: yaffs_guts.c,v 1.46 2007-02-12 16:55:26 wookey Exp $";
+    "$Id: yaffs_guts.c,v 1.47 2007-02-14 01:09:06 wookey Exp $";

 
 #include "yportenv.h"
 
 
 #include "yportenv.h"
 

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 582563abdf0b73445964126b0f7cbc17d0312f91..6e2a9de22267318f34bb7c42deabdea3a3e8dca8 100644 (file)
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -9,11 +9,10 @@
  * 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.
  * 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.

- *

  */
 
 const char *yaffs_mtdif_c_version =
  */
 
 const char *yaffs_mtdif_c_version =

-    "$Id: yaffs_mtdif.c,v 1.18 2007-02-12 16:55:26 wookey Exp $";
+    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";

 
 #include "yportenv.h"
 
 
 #include "yportenv.h"
 

diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c
index 7985f1ed03be7f268c8486b917a5099dcd9f6555..d927c76737ebc796c0bdaf2f50efa5515010bc54 100644 (file)
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtdif2.c
@@ -9,13 +9,12 @@
  * 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.
  * 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.

- *

  */
 
 /* mtd interface for YAFFS2 */
 
 const char *yaffs_mtdif2_c_version =
  */
 
 /* mtd interface for YAFFS2 */
 
 const char *yaffs_mtdif2_c_version =

-    "$Id: yaffs_mtdif2.c,v 1.16 2007-02-12 16:55:26 wookey Exp $";
+    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";

 
 #include "yportenv.h"
 
 
 #include "yportenv.h"
 

diff --git a/yaffs_nand.c b/yaffs_nand.c
index b919da07b8384b90564383f8257bffd82803caaa..c33483c3599b8caadd5dd459514ac355ef96bb82 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -9,11 +9,10 @@
  * 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.
  * 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.

- *

  */
  
 const char *yaffs_nand_c_version =
  */
  
 const char *yaffs_nand_c_version =

-    "$Id: yaffs_nand.c,v 1.6 2007-02-12 16:55:26 wookey Exp $";
+    "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $";

 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"

diff --git a/yaffs_packedtags1.c b/yaffs_packedtags1.c
index 43f5873e83f2877dc5c5c96a7e077323039bad01..f480bf1df11275bfeff54b07f3def82b47d5c392 100644 (file)
--- a/yaffs_packedtags1.c
+++ b/yaffs_packedtags1.c
@@ -9,7 +9,6 @@
  * 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.
  * 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 "yaffs_packedtags1.h"

diff --git a/yaffs_packedtags2.c b/yaffs_packedtags2.c
index 624f8ace1176c1645fce0faf77305369356ead31..6860876c4389803fcbc4274d5caded7fd631cf51 100644 (file)
--- a/yaffs_packedtags2.c
+++ b/yaffs_packedtags2.c
@@ -9,7 +9,6 @@
  * 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.
  * 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_packedtags2.h"
  */
 
 #include "yaffs_packedtags2.h"

diff --git a/yaffs_tagscompat.c b/yaffs_tagscompat.c
index 7f8442c05f2f251001232dd4929cc41edcb28807..d594d6193245ff7ae2f09c5ea063906c56bf7225 100644 (file)
--- a/yaffs_tagscompat.c
+++ b/yaffs_tagscompat.c
@@ -9,7 +9,6 @@
  * 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.
  * 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_guts.h"
  */
 
 #include "yaffs_guts.h"

diff --git a/yaffs_tagsvalidity.c b/yaffs_tagsvalidity.c
index c2ab2b0c15cbcd99331381739d44c9238b4d02fa..9e0bd1cf56bc0c13a04360b1b1b37923c9135db8 100644 (file)
--- a/yaffs_tagsvalidity.c
+++ b/yaffs_tagsvalidity.c
@@ -9,7 +9,6 @@
  * 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.
  * 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_tagsvalidity.h"
  */
 
 #include "yaffs_tagsvalidity.h"