Lindent

diff --git a/yaffs_ecc.c b/yaffs_ecc.c
index 58d0f604ba61895e1828f3b0675598c38e88d5a4..5cb49b416d90933513592aff8dfa8b6802bb9446 100644 (file)
--- a/yaffs_ecc.c
+++ b/yaffs_ecc.c
@@ -12,16 +12,16 @@
  * modify it under the terms of the GNU Lesser General Public License
  * version 2.1 as published by the Free Software Foundation.
  */
  * modify it under the terms of the GNU Lesser General Public License
  * version 2.1 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'


@@ -29,100 +29,130 @@
 // Bit 0 of each entry indicates whether the entry has an odd or even parity, and therefore
 // this bytes influence on the line parity.
 
 // Bit 0 of each entry indicates whether the entry has an odd or even parity, and therefore
 // this bytes influence on the line parity.
 

-const char *yaffs_ecc_c_version = "$Id: yaffs_ecc.c,v 1.4 2005-07-31 00:28:04 charles Exp $";
+const char *yaffs_ecc_c_version =
+    "$Id: yaffs_ecc.c,v 1.5 2005-08-11 00:34:14 charles Exp $";

 
 #include "yportenv.h"
 
 #include "yaffs_ecc.h"
 
 static const unsigned char column_parity_table[] = {
 
 #include "yportenv.h"
 
 #include "yaffs_ecc.h"
 
 static const unsigned char column_parity_table[] = {

-0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69, 0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00, 
-0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc, 0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95, 
-0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0, 0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99, 
-0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65, 0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c, 
-0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc, 0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5, 
-0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59, 0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30, 
-0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55, 0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c, 
-0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0, 0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9, 
-0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0, 0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9, 
-0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55, 0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c, 
-0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59, 0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30, 
-0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc, 0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5, 
-0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65, 0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c, 
-0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0, 0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99, 
-0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc, 0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95, 
-0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69, 0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00, 
+       0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
+       0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,
+       0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc,
+       0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95,
+       0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0,
+       0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99,
+       0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65,
+       0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c,
+       0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc,
+       0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5,
+       0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59,
+       0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30,
+       0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55,
+       0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c,
+       0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0,
+       0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9,
+       0xa9, 0xfc, 0xf0, 0xa5, 0xcc, 0x99, 0x95, 0xc0,
+       0xc0, 0x95, 0x99, 0xcc, 0xa5, 0xf0, 0xfc, 0xa9,
+       0x3c, 0x69, 0x65, 0x30, 0x59, 0x0c, 0x00, 0x55,
+       0x55, 0x00, 0x0c, 0x59, 0x30, 0x65, 0x69, 0x3c,
+       0x30, 0x65, 0x69, 0x3c, 0x55, 0x00, 0x0c, 0x59,
+       0x59, 0x0c, 0x00, 0x55, 0x3c, 0x69, 0x65, 0x30,
+       0xa5, 0xf0, 0xfc, 0xa9, 0xc0, 0x95, 0x99, 0xcc,
+       0xcc, 0x99, 0x95, 0xc0, 0xa9, 0xfc, 0xf0, 0xa5,
+       0x0c, 0x59, 0x55, 0x00, 0x69, 0x3c, 0x30, 0x65,
+       0x65, 0x30, 0x3c, 0x69, 0x00, 0x55, 0x59, 0x0c,
+       0x99, 0xcc, 0xc0, 0x95, 0xfc, 0xa9, 0xa5, 0xf0,
+       0xf0, 0xa5, 0xa9, 0xfc, 0x95, 0xc0, 0xcc, 0x99,
+       0x95, 0xc0, 0xcc, 0x99, 0xf0, 0xa5, 0xa9, 0xfc,
+       0xfc, 0xa9, 0xa5, 0xf0, 0x99, 0xcc, 0xc0, 0x95,
+       0x00, 0x55, 0x59, 0x0c, 0x65, 0x30, 0x3c, 0x69,
+       0x69, 0x3c, 0x30, 0x65, 0x0c, 0x59, 0x55, 0x00,

 };
 
 };
 

-

 static int yaffs_CountBits(unsigned char x)
 {
        int r = 0;
 static int yaffs_CountBits(unsigned char x)
 {
        int r = 0;

-       while(x)
-       {
-               if(x & 1) r++;
+       while (x) {
+               if (x & 1)
+                       r++;

                x >>= 1;
        }
        return r;
 }
 
                x >>= 1;
        }
        return r;
 }
 

-static int yaffs_CountBits32(unsigned  x)
+static int yaffs_CountBits32(unsigned x)

 {
        int r = 0;
 {
        int r = 0;

-       while(x)
-       {
-               if(x & 1) r++;
+       while (x) {
+               if (x & 1)
+                       r++;

                x >>= 1;
        }
        return r;
 }
 
                x >>= 1;
        }
        return r;
 }
 

-
-void yaffs_ECCCalculate(const unsigned char *data,unsigned char *ecc)
+void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc)

 {
        unsigned int i;
 {
        unsigned int i;

-       
+

        unsigned char col_parity = 0;
        unsigned char line_parity = 0;
        unsigned char line_parity_prime = 0;
        unsigned char t;
        unsigned char b;
        unsigned char col_parity = 0;
        unsigned char line_parity = 0;
        unsigned char line_parity_prime = 0;
        unsigned char t;
        unsigned char b;

-       
-       for(i = 0; i < 256; i++)
-       {
+
+       for (i = 0; i < 256; i++) {

                b = column_parity_table[*data++];
                col_parity ^= b;
 
                b = column_parity_table[*data++];
                col_parity ^= b;
 

-               if(b & 0x01) // odd number of bits in the byte
+               if (b & 0x01)   // odd number of bits in the byte

                {
                        line_parity ^= i;
                        line_parity_prime ^= ~i;
                }
                {
                        line_parity ^= i;
                        line_parity_prime ^= ~i;
                }

-               
+

        }
        }

-       
+

        ecc[2] = (~col_parity) | 0x03;
        ecc[2] = (~col_parity) | 0x03;

-       
+

        t = 0;
        t = 0;

-       if(line_parity       & 0x80) t |= 0x80;
-       if(line_parity_prime & 0x80) t |= 0x40;
-       if(line_parity       & 0x40) t |= 0x20;
-       if(line_parity_prime & 0x40) t |= 0x10;
-       if(line_parity       & 0x20) t |= 0x08;
-       if(line_parity_prime & 0x20) t |= 0x04;
-       if(line_parity       & 0x10) t |= 0x02;
-       if(line_parity_prime & 0x10) t |= 0x01;
+       if (line_parity & 0x80)
+               t |= 0x80;
+       if (line_parity_prime & 0x80)
+               t |= 0x40;
+       if (line_parity & 0x40)
+               t |= 0x20;
+       if (line_parity_prime & 0x40)
+               t |= 0x10;
+       if (line_parity & 0x20)
+               t |= 0x08;
+       if (line_parity_prime & 0x20)
+               t |= 0x04;
+       if (line_parity & 0x10)
+               t |= 0x02;
+       if (line_parity_prime & 0x10)
+               t |= 0x01;

        ecc[1] = ~t;
        ecc[1] = ~t;

-       
+

        t = 0;
        t = 0;

-       if(line_parity       & 0x08) t |= 0x80;
-       if(line_parity_prime & 0x08) t |= 0x40;
-       if(line_parity       & 0x04) t |= 0x20;
-       if(line_parity_prime & 0x04) t |= 0x10;
-       if(line_parity       & 0x02) t |= 0x08;
-       if(line_parity_prime & 0x02) t |= 0x04;
-       if(line_parity       & 0x01) t |= 0x02;
-       if(line_parity_prime & 0x01) t |= 0x01;
+       if (line_parity & 0x08)
+               t |= 0x80;
+       if (line_parity_prime & 0x08)
+               t |= 0x40;
+       if (line_parity & 0x04)
+               t |= 0x20;
+       if (line_parity_prime & 0x04)
+               t |= 0x10;
+       if (line_parity & 0x02)
+               t |= 0x08;
+       if (line_parity_prime & 0x02)
+               t |= 0x04;
+       if (line_parity & 0x01)
+               t |= 0x02;
+       if (line_parity_prime & 0x01)
+               t |= 0x01;

        ecc[0] = ~t;
 
 #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
        ecc[0] = ~t;
 
 #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER


@@ -130,29 +160,26 @@ void yaffs_ECCCalculate(const unsigned char *data,unsigned char *ecc)
        t = ecc[0];
        ecc[0] = ecc[1];
        ecc[1] = t;
        t = ecc[0];
        ecc[0] = ecc[1];
        ecc[1] = t;

-#endif 
+#endif

 }
 
 }
 

-int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc, const unsigned char *test_ecc)
+int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
+                    const unsigned char *test_ecc)

 {
 {

-       unsigned char d0, d1, d2; // deltas 
+       unsigned char d0, d1, d2;       // deltas 

 
        d0 = read_ecc[0] ^ test_ecc[0];
        d1 = read_ecc[1] ^ test_ecc[1];
        d2 = read_ecc[2] ^ test_ecc[2];
 
        d0 = read_ecc[0] ^ test_ecc[0];
        d1 = read_ecc[1] ^ test_ecc[1];
        d2 = read_ecc[2] ^ test_ecc[2];

-       
-       
-       
-       if((d0 | d1 | d2) == 0)
-       {
+
+       if ((d0 | d1 | d2) == 0) {

                // no error
                return 0;
        }
                // no error
                return 0;
        }

-       
-       if( ((d0 ^ (d0 >> 1)) & 0x55) == 0x55 &&
+
+       if (((d0 ^ (d0 >> 1)) & 0x55) == 0x55 &&

            ((d1 ^ (d1 >> 1)) & 0x55) == 0x55 &&
            ((d1 ^ (d1 >> 1)) & 0x55) == 0x55 &&

-           ((d2 ^ (d2 >> 1)) & 0x54) == 0x54)
-       {
+           ((d2 ^ (d2 >> 1)) & 0x54) == 0x54) {

                // Single bit (recoverable) error in data
 
                unsigned byte;
                // Single bit (recoverable) error in data
 
                unsigned byte;


@@ -161,127 +188,131 @@ int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc, const unsigne
 #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
                // swap the bytes to correct for the wrong order
                unsigned char t;
 #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
                // swap the bytes to correct for the wrong order
                unsigned char t;

-               
+

                t = d0;
                d0 = d1;
                d1 = t;
 #endif
                t = d0;
                d0 = d1;
                d1 = t;
 #endif

-               
+

                bit = byte = 0;
                bit = byte = 0;

-               
-               
-               if(d1 & 0x80) byte |= 0x80;
-               if(d1 & 0x20) byte |= 0x40;
-               if(d1 & 0x08) byte |= 0x20;
-               if(d1 & 0x02) byte |= 0x10;
-               if(d0 & 0x80) byte |= 0x08;
-               if(d0 & 0x20) byte |= 0x04;
-               if(d0 & 0x08) byte |= 0x02;
-               if(d0 & 0x02) byte |= 0x01;
-
-               if(d2 & 0x80) bit |= 0x04;
-               if(d2 & 0x20) bit |= 0x02;
-               if(d2 & 0x08) bit |= 0x01;
+
+               if (d1 & 0x80)
+                       byte |= 0x80;
+               if (d1 & 0x20)
+                       byte |= 0x40;
+               if (d1 & 0x08)
+                       byte |= 0x20;
+               if (d1 & 0x02)
+                       byte |= 0x10;
+               if (d0 & 0x80)
+                       byte |= 0x08;
+               if (d0 & 0x20)
+                       byte |= 0x04;
+               if (d0 & 0x08)
+                       byte |= 0x02;
+               if (d0 & 0x02)
+                       byte |= 0x01;
+
+               if (d2 & 0x80)
+                       bit |= 0x04;
+               if (d2 & 0x20)
+                       bit |= 0x02;
+               if (d2 & 0x08)
+                       bit |= 0x01;

 
                data[byte] ^= (1 << bit);
 
                data[byte] ^= (1 << bit);

-               
+

                return 1;
        }
                return 1;
        }

-       
-       if((yaffs_CountBits(d0)+yaffs_CountBits(d1)+yaffs_CountBits(d2)) == 1)
-       {
+
+       if ((yaffs_CountBits(d0) + yaffs_CountBits(d1) + yaffs_CountBits(d2)) ==
+           1) {

                // Reccoverable error in ecc
                // Reccoverable error in ecc

-               
+

                read_ecc[0] = test_ecc[0];
                read_ecc[1] = test_ecc[1];
                read_ecc[2] = test_ecc[2];
                read_ecc[0] = test_ecc[0];
                read_ecc[1] = test_ecc[1];
                read_ecc[2] = test_ecc[2];

-               
+

                return 1;
        }
                return 1;
        }

-       

        // Unrecoverable error
        // Unrecoverable error

-       
+

        return -1;
        return -1;

-           

 
 }
 
 
 }
 

-
-
-void yaffs_ECCCalculateOther(const unsigned char *data,unsigned nBytes, yaffs_ECCOther *eccOther)
+void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
+                            yaffs_ECCOther * eccOther)

 {
        unsigned int i;
 {
        unsigned int i;

-       
+

        unsigned char col_parity = 0;
        unsigned line_parity = 0;
        unsigned line_parity_prime = 0;
        unsigned char b;
        unsigned char col_parity = 0;
        unsigned line_parity = 0;
        unsigned line_parity_prime = 0;
        unsigned char b;

-       
-       for(i = 0; i < nBytes; i++)
-       {
+
+       for (i = 0; i < nBytes; i++) {

                b = column_parity_table[*data++];
                col_parity ^= b;
 
                b = column_parity_table[*data++];
                col_parity ^= b;
 

-               if(b & 0x01) // odd number of bits in the byte
+               if (b & 0x01)   // odd number of bits in the byte

                {
                        line_parity ^= i;
                        line_parity_prime ^= ~i;
                }
                {
                        line_parity ^= i;
                        line_parity_prime ^= ~i;
                }

-               
+

        }
        }

-       
+

        eccOther->colParity = (col_parity >> 2) & 0x3f;
        eccOther->lineParity = line_parity;
        eccOther->lineParityPrime = line_parity_prime;
 }
 
        eccOther->colParity = (col_parity >> 2) & 0x3f;
        eccOther->lineParity = line_parity;
        eccOther->lineParityPrime = line_parity_prime;
 }
 

-int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes, yaffs_ECCOther *read_ecc, const yaffs_ECCOther  *test_ecc)
+int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
+                         yaffs_ECCOther * read_ecc,
+                         const yaffs_ECCOther * test_ecc)

 {
 {

-       unsigned char cDelta; // column parity delta
-       unsigned lDelta; // line parity delta
-       unsigned lDeltaPrime; // line parity delta
+       unsigned char cDelta;   // column parity delta
+       unsigned lDelta;        // line parity delta
+       unsigned lDeltaPrime;   // line parity delta

        unsigned bit;
 
        cDelta = read_ecc->colParity ^ test_ecc->colParity;
        unsigned bit;
 
        cDelta = read_ecc->colParity ^ test_ecc->colParity;

-       lDelta = read_ecc->lineParity ^ test_ecc->lineParity;   
+       lDelta = read_ecc->lineParity ^ test_ecc->lineParity;

        lDeltaPrime = read_ecc->lineParityPrime ^ test_ecc->lineParityPrime;
        lDeltaPrime = read_ecc->lineParityPrime ^ test_ecc->lineParityPrime;

-       
-       if((cDelta | lDelta | lDeltaPrime) == 0)
-       {
+
+       if ((cDelta | lDelta | lDeltaPrime) == 0) {

                // no error
                return 0;
        }
                // no error
                return 0;
        }

-       
-       if( lDelta == ~lDeltaPrime &&
-            (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) // Not correct 
+
+       if (lDelta == ~lDeltaPrime && (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))      // Not correct 

        {
                // Single bit (recoverable) error in data
 
                bit = 0;
 
        {
                // Single bit (recoverable) error in data
 
                bit = 0;
 

-               if(cDelta & 0x20) bit |= 0x04;
-               if(cDelta & 0x08) bit |= 0x02;
-               if(cDelta & 0x02) bit |= 0x01;
+               if (cDelta & 0x20)
+                       bit |= 0x04;
+               if (cDelta & 0x08)
+                       bit |= 0x02;
+               if (cDelta & 0x02)
+                       bit |= 0x01;

 
                data[lDelta] ^= (1 << bit);
 
                data[lDelta] ^= (1 << bit);

-               
+

                return 1;
        }
                return 1;
        }

-       
-       if((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) + yaffs_CountBits(cDelta)) == 1)
-       {
+
+       if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
+            yaffs_CountBits(cDelta)) == 1) {

                // Reccoverable error in ecc
                // Reccoverable error in ecc

-               
-               *read_ecc  = *test_ecc;         
+
+               *read_ecc = *test_ecc;

                return 1;
        }
                return 1;
        }

-       

        // Unrecoverable error
        // Unrecoverable error

-       
+

        return -1;
        return -1;

-           

 
 }
 
 }

-
-
-

diff --git a/yaffs_ecc.h b/yaffs_ecc.h
index f96d7077a72efb1ad6e8a2bf9d4e30f20d7ee56f..5f026a09a0f208a420e0d06a2f8b49648a7421ba 100644 (file)
--- a/yaffs_ecc.h
+++ b/yaffs_ecc.h
@@ -12,30 +12,33 @@
  * published by the Free Software Foundation.
  *
  */
  * 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.
+  *
+  */

 
 #ifndef __YAFFS_ECC_H__
 #define __YAFFS_ECC_H__
 
 
 #ifndef __YAFFS_ECC_H__
 #define __YAFFS_ECC_H__
 

-typedef struct
-{
+typedef struct {

        unsigned char colParity;
        unsigned lineParity;
        unsigned lineParityPrime;
 } yaffs_ECCOther;
 
        unsigned char colParity;
        unsigned lineParity;
        unsigned lineParityPrime;
 } yaffs_ECCOther;
 

-void yaffs_ECCCalculate(const unsigned char *data,unsigned char *ecc);
-int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc, const unsigned char *test_ecc);
+void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc);
+int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
+                    const unsigned char *test_ecc);

 
 

-void yaffs_ECCCalculateOther(const unsigned char *data,unsigned nBytes, yaffs_ECCOther *ecc);
-int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes, yaffs_ECCOther *read_ecc, const yaffs_ECCOther *test_ecc);
+void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
+                            yaffs_ECCOther * ecc);
+int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
+                         yaffs_ECCOther * read_ecc,
+                         const yaffs_ECCOther * test_ecc);

 #endif
 #endif

diff --git a/yaffs_guts.h b/yaffs_guts.h
index 0a8000da0522f73695df5c30939a2d96ddd8265e..0c608fdfd94dcb36bd9fa386304c80ed6573a52d 100644 (file)
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -14,7 +14,7 @@
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  *
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  *

- * $Id: yaffs_guts.h,v 1.11 2005-07-31 06:52:40 charles Exp $
+ * $Id: yaffs_guts.h,v 1.12 2005-08-11 00:34:14 charles Exp $

  */
 
 #ifndef __YAFFS_GUTS_H__
  */
 
 #ifndef __YAFFS_GUTS_H__


@@ -31,7 +31,7 @@
 // Give us an FF=0xFF 
 // Give us an S=0x53
 // And what have we got... 
 // Give us an FF=0xFF 
 // Give us an S=0x53
 // And what have we got... 

-#define YAFFS_MAGIC                                    0x5941FF53
+#define YAFFS_MAGIC                    0x5941FF53

 
 #define YAFFS_NTNODES_LEVEL0           16
 #define YAFFS_TNODES_LEVEL0_BITS       4
 
 #define YAFFS_NTNODES_LEVEL0           16
 #define YAFFS_TNODES_LEVEL0_BITS       4


@@ -53,7 +53,7 @@
 #define YAFFS_MIN_YAFFS2_CHUNK_SIZE    1024
 #define YAFFS_MIN_YAFFS2_SPARE_SIZE    32
 
 #define YAFFS_MIN_YAFFS2_CHUNK_SIZE    1024
 #define YAFFS_MIN_YAFFS2_SPARE_SIZE    32
 

-#define YAFFS_MAX_CHUNK_ID                     0x000FFFFF
+#define YAFFS_MAX_CHUNK_ID             0x000FFFFF

 
 #define YAFFS_UNUSED_OBJECT_ID         0x0003FFFF
 
 
 #define YAFFS_UNUSED_OBJECT_ID         0x0003FFFF
 


@@ -63,8 +63,7 @@
 
 #define YAFFS_NOBJECT_BUCKETS          256
 
 
 #define YAFFS_NOBJECT_BUCKETS          256
 

-
-#define YAFFS_OBJECT_SPACE                     0x40000
+#define YAFFS_OBJECT_SPACE             0x40000

 
 #ifdef CONFIG_YAFFS_UNICODE
 #define YAFFS_MAX_NAME_LENGTH          127
 
 #ifdef CONFIG_YAFFS_UNICODE
 #define YAFFS_MAX_NAME_LENGTH          127


@@ -76,8 +75,8 @@
 
 #define YAFFS_SHORT_NAME_LENGTH                15
 
 
 #define YAFFS_SHORT_NAME_LENGTH                15
 

-
-#define YAFFS_OBJECTID_ROOT                    1
+// Some special object ids
+#define YAFFS_OBJECTID_ROOT            1

 #define YAFFS_OBJECTID_LOSTNFOUND      2
 #define YAFFS_OBJECTID_UNLINKED                3
 #define YAFFS_OBJECTID_DELETED         4
 #define YAFFS_OBJECTID_LOSTNFOUND      2
 #define YAFFS_OBJECTID_UNLINKED                3
 #define YAFFS_OBJECTID_DELETED         4


@@ -96,16 +95,14 @@
 #define YAFFS_LOWEST_SEQUENCE_NUMBER   0x00001000
 #define YAFFS_HIGHEST_SEQUENCE_NUMBER  0xEFFFFF00
 
 #define YAFFS_LOWEST_SEQUENCE_NUMBER   0x00001000
 #define YAFFS_HIGHEST_SEQUENCE_NUMBER  0xEFFFFF00
 

-

 // ChunkCache is used for short read/write operations.
 // ChunkCache is used for short read/write operations.

-typedef struct
-{
+typedef struct {

        struct yaffs_ObjectStruct *object;
        int chunkId;
        int lastUse;
        struct yaffs_ObjectStruct *object;
        int chunkId;
        int lastUse;

-       int dirty;      
-       int nBytes;     // Only valid if the cache is dirty
-       int locked; // Can't push out or flush while locked..
+       int dirty;
+       int nBytes;             // Only valid if the cache is dirty
+       int locked;             // Can't push out or flush while locked..

 #ifdef CONFIG_YAFFS_YAFFS2
        __u8 *data;
 #else
 #ifdef CONFIG_YAFFS_YAFFS2
        __u8 *data;
 #else


@@ -113,41 +110,36 @@ typedef struct
 #endif
 } yaffs_ChunkCache;
 
 #endif
 } yaffs_ChunkCache;
 

-

 #ifndef CONFIG_YAFFS_NO_YAFFS1
 // Tags structures in RAM
 // NB This uses bitfield. Bitfields should not straddle a u32 boundary otherwise
 // the structure size will get blown out.
 
 #ifndef CONFIG_YAFFS_NO_YAFFS1
 // Tags structures in RAM
 // NB This uses bitfield. Bitfields should not straddle a u32 boundary otherwise
 // the structure size will get blown out.
 

-typedef struct
-{   
+typedef struct {

        unsigned chunkId:20;
        unsigned chunkId:20;

-    unsigned serialNumber:2;
-    unsigned byteCount:10;
-    unsigned objectId:18;
-    unsigned ecc:12;
-    unsigned unusedStuff:2;
+       unsigned serialNumber:2;
+       unsigned byteCount:10;
+       unsigned objectId:18;
+       unsigned ecc:12;
+       unsigned unusedStuff:2;

 
 } yaffs_Tags;
 
 
 } yaffs_Tags;
 

-typedef union
-{
-    yaffs_Tags asTags;
-    __u8       asBytes[8];
+typedef union {
+       yaffs_Tags asTags;
+       __u8 asBytes[8];

 } yaffs_TagsUnion;
 
 #endif
 
 } yaffs_TagsUnion;
 
 #endif
 

-typedef enum
-{
+typedef enum {

        YAFFS_ECC_RESULT_UNKNOWN,
        YAFFS_ECC_RESULT_NO_ERROR,
        YAFFS_ECC_RESULT_FIXED,
        YAFFS_ECC_RESULT_UNFIXED
 } yaffs_ECCResult;
 
        YAFFS_ECC_RESULT_UNKNOWN,
        YAFFS_ECC_RESULT_NO_ERROR,
        YAFFS_ECC_RESULT_FIXED,
        YAFFS_ECC_RESULT_UNFIXED
 } yaffs_ECCResult;
 

-typedef enum
-{
+typedef enum {

        YAFFS_OBJECT_TYPE_UNKNOWN,
        YAFFS_OBJECT_TYPE_FILE,
        YAFFS_OBJECT_TYPE_SYMLINK,
        YAFFS_OBJECT_TYPE_UNKNOWN,
        YAFFS_OBJECT_TYPE_FILE,
        YAFFS_OBJECT_TYPE_SYMLINK,


@@ -156,157 +148,149 @@ typedef enum
        YAFFS_OBJECT_TYPE_SPECIAL
 } yaffs_ObjectType;
 
        YAFFS_OBJECT_TYPE_SPECIAL
 } yaffs_ObjectType;
 

-
-typedef struct
-{
+typedef struct {

 
        unsigned validMarker0;
 
        unsigned validMarker0;

-       unsigned chunkUsed;                 //  Status of the chunk: used or unused
-       unsigned objectId;                      // If 0 then this is not part of an object (unused)
-       unsigned chunkId;                       // If 0 then this is a header, else a data chunk
-       unsigned byteCount;                 // Only valid for data chunks
-       
-       
+       unsigned chunkUsed;     //  Status of the chunk: used or unused
+       unsigned objectId;      // If 0 then this is not part of an object (unused)
+       unsigned chunkId;       // If 0 then this is a header, else a data chunk
+       unsigned byteCount;     // Only valid for data chunks
+

        // The following stuff only has meaning when we read
        // The following stuff only has meaning when we read

-       yaffs_ECCResult eccResult;  // Only valid when we read.
-       unsigned blockBad;                      // Only valid on reading
+       yaffs_ECCResult eccResult;      // Only valid when we read.
+       unsigned blockBad;      // Only valid on reading
+
+       // YAFFS 1 stuff        
+       unsigned chunkDeleted;  // The chunk is marked deleted
+       unsigned serialNumber;  // Yaffs1 2-bit serial number

 
 

-       // YAFFS 1 stuff        
-       unsigned chunkDeleted;          // The chunk is marked deleted
-       unsigned serialNumber;          // Yaffs1 2-bit serial number
-       

        // YAFFS2 stuff
        // YAFFS2 stuff

-       unsigned sequenceNumber;        // The sequence number of this block
+       unsigned sequenceNumber;        // The sequence number of this block

 
        // Extra info if this is an object header (YAFFS2 only)
 
        // Extra info if this is an object header (YAFFS2 only)

-       
-       unsigned extraHeaderInfoAvailable; // There is extra info available if this is not zero
-       unsigned extraParentObjectId;      // The parent object
-       unsigned extraIsShrinkHeader;      // Is it a shrink header?
-       unsigned extraShadows;             // Does this shadow another object?
-       
-       yaffs_ObjectType extraObjectType;  // What object type?

 
 

-       unsigned extraFileLength;          // Length if it is a file
-       unsigned extraEquivalentObjectId;  // Equivalent object Id if it is a hard link
+       unsigned extraHeaderInfoAvailable;      // There is extra info available if this is not zero
+       unsigned extraParentObjectId;   // The parent object
+       unsigned extraIsShrinkHeader;   // Is it a shrink header?
+       unsigned extraShadows;  // Does this shadow another object?
+
+       yaffs_ObjectType extraObjectType;       // What object type?
+
+       unsigned extraFileLength;       // Length if it is a file
+       unsigned extraEquivalentObjectId;       // Equivalent object Id if it is a hard link
+
+       unsigned validMarker1;

 
 

-       unsigned validMarker1;  
-       

 } yaffs_ExtendedTags;
 
 } yaffs_ExtendedTags;
 

-#ifndef CONFIG_YAFFS_NO_YAFFS1

 // Spare structure
 // Spare structure

-typedef struct
-{
-    __u8  tagByte0;
-    __u8  tagByte1;
-    __u8  tagByte2;
-    __u8  tagByte3;
-    __u8  pageStatus;  // set to 0 to delete the chunk
-    __u8  blockStatus;
-    __u8  tagByte4;
-    __u8  tagByte5;
-    __u8  ecc1[3];
-    __u8  tagByte6;
-    __u8  tagByte7;
-    __u8  ecc2[3];
+typedef struct {
+       __u8 tagByte0;
+       __u8 tagByte1;
+       __u8 tagByte2;
+       __u8 tagByte3;
+       __u8 pageStatus;        // set to 0 to delete the chunk
+       __u8 blockStatus;
+       __u8 tagByte4;
+       __u8 tagByte5;
+       __u8 ecc1[3];
+       __u8 tagByte6;
+       __u8 tagByte7;
+       __u8 ecc2[3];

 } yaffs_Spare;
 
 //Special structure for passing through to mtd
 struct yaffs_NANDSpare {
 } yaffs_Spare;
 
 //Special structure for passing through to mtd
 struct yaffs_NANDSpare {

-       yaffs_Spare     spare;
-       int             eccres1;
-       int             eccres2;
+       yaffs_Spare spare;
+       int eccres1;
+       int eccres2;

 };
 };

-#endif
-

 
 // Block data in RAM
 
 typedef enum {
 
 // Block data in RAM
 
 typedef enum {

-       YAFFS_BLOCK_STATE_UNKNOWN       = 0,
+       YAFFS_BLOCK_STATE_UNKNOWN = 0,

 
        YAFFS_BLOCK_STATE_SCANNING,
 
        YAFFS_BLOCK_STATE_SCANNING,

-       YAFFS_BLOCK_STATE_NEEDS_SCANNING,// The block might have something on it (ie it is allocating or full, perhaps empty)
-                                                                       // but it needs to be scanned to determine its true state.
-                                                                       // This state is only valid during yaffs_Scan.
-                                                                       // NB We tolerate empty because the pre-scanner might be incapable of deciding
-                                                                       // However, if this state is returned on a YAFFS2 device, then we expect a sequence number
-                                                                       
-       YAFFS_BLOCK_STATE_EMPTY,                // This block is empty
-       
-       YAFFS_BLOCK_STATE_ALLOCATING,   // This block is partially allocated. 
-                                                                       // This is the one currently being used for page
-                                                                       // allocation. Should never be more than one of these
-                                                       
-
-       YAFFS_BLOCK_STATE_FULL,                 // All the pages in this block have been allocated.
-                                                                       // At least one page holds valid data.
-                                                        
-       YAFFS_BLOCK_STATE_DIRTY,                // All pages have been allocated and deleted. 
-                                                                       // Erase me, reuse me.
-                                                                       
-       YAFFS_BLOCK_STATE_COLLECTING,   // This block is being garbage collected
-                                                       
-       YAFFS_BLOCK_STATE_DEAD                  // This block has failed and is not in use
-
+       YAFFS_BLOCK_STATE_NEEDS_SCANNING,
+       // The block might have something on it (ie it is allocating or full, perhaps empty)
+       // but it needs to be scanned to determine its true state.
+       // This state is only valid during yaffs_Scan.
+       // NB We tolerate empty because the pre-scanner might be incapable of deciding
+       // However, if this state is returned on a YAFFS2 device, then we expect a sequence number
+
+       YAFFS_BLOCK_STATE_EMPTY,
+       // This block is empty
+
+       YAFFS_BLOCK_STATE_ALLOCATING,
+       // This block is partially allocated. 
+       // This is the one currently being used for page
+       // allocation. Should never be more than one of these
+
+       YAFFS_BLOCK_STATE_FULL, 
+       // All the pages in this block have been allocated.
+       // At least one page holds valid data.
+
+       YAFFS_BLOCK_STATE_DIRTY,
+       // All pages have been allocated and deleted. 
+       // Erase me, reuse me.
+
+       YAFFS_BLOCK_STATE_COLLECTING,   
+       // This block is being garbage collected
+
+       YAFFS_BLOCK_STATE_DEAD  
+       // This block has failed and is not in use

 } yaffs_BlockState;
 
 } yaffs_BlockState;
 

+typedef struct {

 
 

-
-
-typedef struct
-{
-
-    int   softDeletions:12;  // number of soft deleted pages
-    int   pagesInUse:12;       // number of pages in use
-    yaffs_BlockState blockState:4;     // One of the above block states
-    __u32 needsRetiring:1;     // Data has failed on this block, need to get valid data off
-                                               // and retire the block.
+       int softDeletions:12;   // number of soft deleted pages
+       int pagesInUse:12;      // number of pages in use
+       yaffs_BlockState blockState:4;  // One of the above block states
+       __u32 needsRetiring:1;  // Data has failed on this block, need to get valid data off
+                               // and retire the block.

 #ifdef CONFIG_YAFFS_YAFFS2
 #ifdef CONFIG_YAFFS_YAFFS2

-       __u32 hasShrinkHeader:1;// This block has at least one object header that does a shrink
+       __u32 hasShrinkHeader:1;        // This block has at least one object header that does a shrink

        __u32 sequenceNumber;   // block sequence number for yaffs2
 #endif
 
 } yaffs_BlockInfo;
 
        __u32 sequenceNumber;   // block sequence number for yaffs2
 #endif
 
 } yaffs_BlockInfo;
 

-

 //////////////////// Object structure ///////////////////////////
 // This is the object structure as stored on NAND
 
 //////////////////// Object structure ///////////////////////////
 // This is the object structure as stored on NAND
 

-typedef struct
-{
+typedef struct {

        yaffs_ObjectType type;
 
        yaffs_ObjectType type;
 

-       // Apply to everything  
-       int   parentObjectId;
+       // Apply to everything  
+       int parentObjectId;

        __u16 sum__NoLongerUsed;        // checksum of name. Calc this off the name to prevent inconsistencies
        __u16 sum__NoLongerUsed;        // checksum of name. Calc this off the name to prevent inconsistencies

-       YCHAR  name[YAFFS_MAX_NAME_LENGTH + 1];
+       YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];

 
        // Thes following apply to directories, files, symlinks - not hard links
 
        // Thes following apply to directories, files, symlinks - not hard links

-       __u32 yst_mode;  // protection
+       __u32 yst_mode;         // protection

 
 #ifdef CONFIG_YAFFS_WINCE
        __u32 notForWinCE[5];
 #else
 
 #ifdef CONFIG_YAFFS_WINCE
        __u32 notForWinCE[5];
 #else

-       __u32 yst_uid;   // user ID of owner
-       __u32 yst_gid;    // group ID of owner 
-       __u32 yst_atime; // time of last access
-       __u32 yst_mtime; // time of last modification
-       __u32 yst_ctime; // time of last change
+       __u32 yst_uid;          // user ID of owner
+       __u32 yst_gid;          // group ID of owner 
+       __u32 yst_atime;        // time of last access
+       __u32 yst_mtime;        // time of last modification
+       __u32 yst_ctime;        // time of last change

 #endif
 
        // File size  applies to files only
 #endif
 
        // File size  applies to files only

-       int fileSize; 
-               
+       int fileSize;
+

        // Equivalent object id applies to hard links only.
        // Equivalent object id applies to hard links only.

-       int  equivalentObjectId;
-       
+       int equivalentObjectId;
+

        // Alias is for symlinks only.
        YCHAR alias[YAFFS_MAX_ALIAS_LENGTH + 1];
        // Alias is for symlinks only.
        YCHAR alias[YAFFS_MAX_ALIAS_LENGTH + 1];

-       
-       __u32 yst_rdev;  // device stuff for block and char devices (maj/min)
-       
+
+       __u32 yst_rdev;         // device stuff for block and char devices (maj/min)
+

 #ifdef CONFIG_YAFFS_WINCE
        __u32 win_ctime[2];
        __u32 win_atime[2];
 #ifdef CONFIG_YAFFS_WINCE
        __u32 win_ctime[2];
        __u32 win_atime[2];


@@ -316,40 +300,34 @@ typedef struct
        __u32 roomToGrow[10];
 #endif
 
        __u32 roomToGrow[10];
 #endif
 

-       int shadowsObject; // This object header shadows the specified object if not > 0
+       int shadowsObject;      // This object header shadows the specified object if not > 0

 
        // isShrink applies to object headers written when we shrink the file (ie resize)
        __u32 isShrink;
 
        // isShrink applies to object headers written when we shrink the file (ie resize)
        __u32 isShrink;

-       
-} yaffs_ObjectHeader;
-

 
 

+} yaffs_ObjectHeader;

 
 ////////////////////  Tnode ///////////////////////////
 
 
 ////////////////////  Tnode ///////////////////////////
 

-union yaffs_Tnode_union
-{
+union yaffs_Tnode_union {

 #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
 #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG

-       union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL+1];
+       union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL + 1];

 #else
        union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL];
 #endif
        __u16 level0[YAFFS_NTNODES_LEVEL0];
 #else
        union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL];
 #endif
        __u16 level0[YAFFS_NTNODES_LEVEL0];

-       
+

 };
 
 typedef union yaffs_Tnode_union yaffs_Tnode;
 
 };
 
 typedef union yaffs_Tnode_union yaffs_Tnode;
 

-struct yaffs_TnodeList_struct
-{
+struct yaffs_TnodeList_struct {

        struct yaffs_TnodeList_struct *next;
        yaffs_Tnode *tnodes;
 };
 
 typedef struct yaffs_TnodeList_struct yaffs_TnodeList;
 
        struct yaffs_TnodeList_struct *next;
        yaffs_Tnode *tnodes;
 };
 
 typedef struct yaffs_TnodeList_struct yaffs_TnodeList;
 

-
-

 ///////////////////  Object ////////////////////////////////
 // An object can be one of:
 // - a directory (no data, has children links
 ///////////////////  Object ////////////////////////////////
 // An object can be one of:
 // - a directory (no data, has children links


@@ -357,89 +335,78 @@ typedef struct yaffs_TnodeList_struct yaffs_TnodeList;
 // - a symlink [symbolic link] (the alias).
 // - a hard link
 
 // - a symlink [symbolic link] (the alias).
 // - a hard link
 

-
-typedef struct 
-{
+typedef struct {

        __u32 fileSize;
        __u32 scannedFileSize;
        __u32 shrinkSize;
        __u32 fileSize;
        __u32 scannedFileSize;
        __u32 shrinkSize;

-       int   topLevel;
+       int topLevel;

        yaffs_Tnode *top;
 } yaffs_FileStructure;
 
        yaffs_Tnode *top;
 } yaffs_FileStructure;
 

-typedef struct
-{
-       struct list_head children; // list of child links
+typedef struct {
+       struct list_head children;      // list of child links

 } yaffs_DirectoryStructure;
 
 } yaffs_DirectoryStructure;
 

-typedef struct
-{
+typedef struct {

        YCHAR *alias;
 } yaffs_SymLinkStructure;
 
        YCHAR *alias;
 } yaffs_SymLinkStructure;
 

-typedef struct
-{
+typedef struct {

        struct yaffs_ObjectStruct *equivalentObject;
        struct yaffs_ObjectStruct *equivalentObject;

-       __u32   equivalentObjectId;
+       __u32 equivalentObjectId;

 } yaffs_HardLinkStructure;
 
 } yaffs_HardLinkStructure;
 

-typedef union
-{
+typedef union {

        yaffs_FileStructure fileVariant;
        yaffs_DirectoryStructure directoryVariant;
        yaffs_SymLinkStructure symLinkVariant;
        yaffs_HardLinkStructure hardLinkVariant;
 } yaffs_ObjectVariant;
 
        yaffs_FileStructure fileVariant;
        yaffs_DirectoryStructure directoryVariant;
        yaffs_SymLinkStructure symLinkVariant;
        yaffs_HardLinkStructure hardLinkVariant;
 } yaffs_ObjectVariant;
 

-
-struct  yaffs_ObjectStruct
-{
-       __u8 deleted: 1;                // This should only apply to unlinked files.
-       __u8 softDeleted: 1;    // it has also been soft deleted
-       __u8 unlinked: 1;               // An unlinked file. The file should be in the unlinked pseudo directory.
-       __u8 fake:1;                    // A fake object has no presence on NAND.
-       __u8 renameAllowed:1;           // Some objects are not allowed to be renamed.
+struct yaffs_ObjectStruct {
+       __u8 deleted:1;         // This should only apply to unlinked files.
+       __u8 softDeleted:1;     // it has also been soft deleted
+       __u8 unlinked:1;        // An unlinked file. The file should be in the unlinked pseudo directory.
+       __u8 fake:1;            // A fake object has no presence on NAND.
+       __u8 renameAllowed:1;   // Some objects are not allowed to be renamed.

        __u8 unlinkAllowed:1;
        __u8 unlinkAllowed:1;

-       __u8 dirty:1;                   // the object needs to be written to flash
-       __u8 valid:1;                   // When the file system is being loaded up, this 
-                                                       // object might be created before the data
-                                                       // is available (ie. file data records appear before the header).
-       __u8 serial;                    // serial number of chunk in NAND. Store here so we don't have to
-
-       __u8  deferedFree: 1;           // For Linux kernel. Object is removed from NAND, but still in the inode cache.
-                                       // Free of object is defered.
-                                       
-       __u8 lazyLoaded;                // Vital info has been loaded from tags. Not all info available.
-                                       // 
-
-                                       // read back the old one to update.
-       __u16 sum;                      // sum of the name to speed searching
-       
-       struct yaffs_DeviceStruct *myDev; // The device I'm on
-       
-                                                               
+       __u8 dirty:1;           // the object needs to be written to flash
+       __u8 valid:1;           // When the file system is being loaded up, this 
+       // object might be created before the data
+       // is available (ie. file data records appear before the header).
+       __u8 serial;            // serial number of chunk in NAND. Store here so we don't have to
+
+       __u8 deferedFree:1;     // For Linux kernel. Object is removed from NAND, but still in the inode cache.
+       // Free of object is defered.
+
+       __u8 lazyLoaded;        // Vital info has been loaded from tags. Not all info available.
+       // 
+
+       // read back the old one to update.
+       __u16 sum;              // sum of the name to speed searching
+
+       struct yaffs_DeviceStruct *myDev;       // The device I'm on
+

        struct list_head hashLink;      // list of objects in this hash bucket
        struct list_head hashLink;      // list of objects in this hash bucket

-                                                       

 
 

-       struct list_head hardLinks; // all the equivalent hard linked objects
-                                                               // live on this list
+       struct list_head hardLinks;     // all the equivalent hard linked objects
+       // live on this list

        // directory structure stuff
        // directory structure stuff

-       struct yaffs_ObjectStruct  *parent;     //my parent directory
+       struct yaffs_ObjectStruct *parent;      //my parent directory

        struct list_head siblings;      // siblings in a directory
        struct list_head siblings;      // siblings in a directory

-                                                               // also used for linking up the free list
-               
+       // also used for linking up the free list
+

        // Where's my object header in NAND?
        int chunkId;            // where it lives
 
        // Where's my object header in NAND?
        int chunkId;            // where it lives
 

-       int nDataChunks;        // Number of data chunks attached to the file.  
-       
+       int nDataChunks;        // Number of data chunks attached to the file.  
+

        __u32 objectId;         // the object id value
        __u32 objectId;         // the object id value

-       
-       
-       __u32 yst_mode;         // protection
+
+       __u32 yst_mode;         // protection

 
 #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
 
 #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM

-       YCHAR shortName[YAFFS_SHORT_NAME_LENGTH+1];
+       YCHAR shortName[YAFFS_SHORT_NAME_LENGTH + 1];

 #endif
 
 #ifndef __KERNEL__
 #endif
 
 #ifndef __KERNEL__


@@ -451,45 +418,36 @@ struct  yaffs_ObjectStruct
        __u32 win_mtime[2];
        __u32 win_atime[2];
 #else
        __u32 win_mtime[2];
        __u32 win_atime[2];
 #else

-       __u32 yst_uid;          // user ID of owner
-       __u32 yst_gid;          // group ID of owner 
-       __u32 yst_atime;        // time of last access
-       __u32 yst_mtime;        // time of last modification
-       __u32 yst_ctime;        // time of last change
+       __u32 yst_uid;          // user ID of owner
+       __u32 yst_gid;          // group ID of owner 
+       __u32 yst_atime;        // time of last access
+       __u32 yst_mtime;        // time of last modification
+       __u32 yst_ctime;        // time of last change

 #endif
 
 #endif
 

-       __u32 yst_rdev;             // device stuff for block and char devices
-
-
+       __u32 yst_rdev;         // device stuff for block and char devices

 
 #ifdef __KERNEL__
        struct inode *myInode;
 
 #endif
 
 
 #ifdef __KERNEL__
        struct inode *myInode;
 
 #endif
 

-
-       

        yaffs_ObjectType variantType;
        yaffs_ObjectType variantType;

-       
-       yaffs_ObjectVariant variant;
-       
-};

 
 

+       yaffs_ObjectVariant variant;

 
 

+};

 
 typedef struct yaffs_ObjectStruct yaffs_Object;
 
 
 typedef struct yaffs_ObjectStruct yaffs_Object;
 

-
-struct yaffs_ObjectList_struct
-{
+struct yaffs_ObjectList_struct {

        yaffs_Object *objects;
        struct yaffs_ObjectList_struct *next;
 };
 
 typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
 
        yaffs_Object *objects;
        struct yaffs_ObjectList_struct *next;
 };
 
 typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
 

-typedef struct
-{
+typedef struct {

        struct list_head list;
        int count;
 } yaffs_ObjectBucket;
        struct list_head list;
        int count;
 } yaffs_ObjectBucket;


@@ -500,111 +458,117 @@ typedef struct
 
 typedef struct {
        __u8 *buffer;
 
 typedef struct {
        __u8 *buffer;

-       int line; // track from whence this buffer was allocated
+       int line;               // track from whence this buffer was allocated

        int maxLine;
 } yaffs_TempBuffer;
 
 //////////////////// Device ////////////////////////////////
 
        int maxLine;
 } yaffs_TempBuffer;
 
 //////////////////// Device ////////////////////////////////
 

-struct yaffs_DeviceStruct
-{
+struct yaffs_DeviceStruct {

        struct list_head devList;
        const char *name;
 
        // Entry parameters set up way early. Yaffs sets up the rest.
        struct list_head devList;
        const char *name;
 
        // Entry parameters set up way early. Yaffs sets up the rest.

-       int   nBytesPerChunk;    // Should be a power of 2 >= 512
-       int       nChunksPerBlock;       // does not need to be a power of 2
-       int   nBytesPerSpare;    // spare area size
-       int   startBlock;                // Start block we're allowed to use
-       int   endBlock;                  // End block we're allowed to use
-       int   nReservedBlocks;   // We want this tuneable so that we can reduce
-                                                        // reserved blocks on NOR and RAM.
-       
-       int   nShortOpCaches;   // If <= 0, then short op caching is disabled, else
-                                                       // the number of short op caches (don't use too many).
-                                                       
-       int useHeaderFileSize; // Flag to determine if we should use file sizes from the header 
+       int nBytesPerChunk;     // Should be a power of 2 >= 512
+       int nChunksPerBlock;    // does not need to be a power of 2
+       int nBytesPerSpare;     // spare area size
+       int startBlock;         // Start block we're allowed to use
+       int endBlock;           // End block we're allowed to use
+       int nReservedBlocks;    // We want this tuneable so that we can reduce
+       // reserved blocks on NOR and RAM.

 
 

-       int   useNANDECC;               // Flag to decide whether or not to use NANDECC
-       
-       
-       void *genericDevice; // Pointer to device context
-                                                // On an mtd this holds the mtd pointer.
+       int nShortOpCaches;     // If <= 0, then short op caching is disabled, else
+       // the number of short op caches (don't use too many).
+
+       int useHeaderFileSize;  // Flag to determine if we should use file sizes from the header 
+
+       int useNANDECC;         // Flag to decide whether or not to use NANDECC
+
+       void *genericDevice;    // Pointer to device context
+       // On an mtd this holds the mtd pointer.

 
        // NAND access functions (Must be set before calling YAFFS)
 
        // NAND access functions (Must be set before calling YAFFS)

-       

 
 

-       int (*writeChunkToNAND)(struct yaffs_DeviceStruct *dev,int chunkInNAND, const __u8 *data, const yaffs_Spare *spare);
-       int (*readChunkFromNAND)(struct yaffs_DeviceStruct *dev,int chunkInNAND, __u8 *data, yaffs_Spare *spare);
-       int (*eraseBlockInNAND)(struct yaffs_DeviceStruct *dev,int blockInNAND);        
-       int (*initialiseNAND)(struct yaffs_DeviceStruct *dev);
+       int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
+                                int chunkInNAND, const __u8 * data,
+                                const yaffs_Spare * spare);
+       int (*readChunkFromNAND) (struct yaffs_DeviceStruct * dev,
+                                 int chunkInNAND, __u8 * data,
+                                 yaffs_Spare * spare);
+       int (*eraseBlockInNAND) (struct yaffs_DeviceStruct * dev,
+                                int blockInNAND);
+       int (*initialiseNAND) (struct yaffs_DeviceStruct * dev);

 
 #ifdef CONFIG_YAFFS_YAFFS2
 
 #ifdef CONFIG_YAFFS_YAFFS2

-       int (*writeChunkWithTagsToNAND)(struct yaffs_DeviceStruct *dev,int chunkInNAND, const __u8 *data, const yaffs_ExtendedTags *tags);
-       int (*readChunkWithTagsFromNAND)(struct yaffs_DeviceStruct *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags);
-       int (*markNANDBlockBad)(struct yaffs_DeviceStruct *dev, int blockNo);
-       int (*queryNANDBlock)(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, int *sequenceNumber);
+       int (*writeChunkWithTagsToNAND) (struct yaffs_DeviceStruct * dev,
+                                        int chunkInNAND, const __u8 * data,
+                                        const yaffs_ExtendedTags * tags);
+       int (*readChunkWithTagsFromNAND) (struct yaffs_DeviceStruct * dev,
+                                         int chunkInNAND, __u8 * data,
+                                         yaffs_ExtendedTags * tags);
+       int (*markNANDBlockBad) (struct yaffs_DeviceStruct * dev, int blockNo);
+       int (*queryNANDBlock) (struct yaffs_DeviceStruct * dev, int blockNo,
+                              yaffs_BlockState * state, int *sequenceNumber);

 #endif
 
        int isYaffs2;
 
        // End of stuff that must be set before initialisation.
 #endif
 
        int isYaffs2;
 
        // End of stuff that must be set before initialisation.

-       
+

        // Runtime parameters. Set up by YAFFS.
        // Runtime parameters. Set up by YAFFS.

-       
-       __u16 chunkGroupBits; // 0 for devices <= 32MB. else log2(nchunks) - 16
-       __u16 chunkGroupSize; // == 2^^chunkGroupBits
-       
+
+       __u16 chunkGroupBits;   // 0 for devices <= 32MB. else log2(nchunks) - 16
+       __u16 chunkGroupSize;   // == 2^^chunkGroupBits
+

 #ifdef __KERNEL__
 
 #ifdef __KERNEL__
 

-       struct semaphore sem;// Semaphore for waiting on erasure.
-       struct semaphore grossLock; // Gross locking semaphore
-       __u8 * spareBuffer; // For mtdif2 use. Don't know the size of the buffer at compile time so we have to allocate it.
-       void (*putSuperFunc)(struct super_block *sb);
+       struct semaphore sem;   // Semaphore for waiting on erasure.
+       struct semaphore grossLock;     // Gross locking semaphore
+       __u8 *spareBuffer;      // For mtdif2 use. Don't know the size of the buffer at compile time so we have to allocate it.
+       void (*putSuperFunc) (struct super_block * sb);

 #endif
 
        int isMounted;
 #endif
 
        int isMounted;

-       
+

        // Stuff to support block offsetting to support start block zero
        int internalStartBlock;
        int internalEndBlock;
        int blockOffset;
        int chunkOffset;
        // Stuff to support block offsetting to support start block zero
        int internalStartBlock;
        int internalEndBlock;
        int blockOffset;
        int chunkOffset;

-       
+

        // Block Info
        yaffs_BlockInfo *blockInfo;
        // Block Info
        yaffs_BlockInfo *blockInfo;

-       __u8 *chunkBits;   // bitmap of chunks in use
-       int   chunkBitmapStride; // Number of bytes of chunkBits per block. 
-                                                        //     Must be consistent with nChunksPerBlock.
-
+       __u8 *chunkBits;        // bitmap of chunks in use
+       int chunkBitmapStride;  // Number of bytes of chunkBits per block. 
+       //     Must be consistent with nChunksPerBlock.

 
 

-       int   nErasedBlocks;
-       int   allocationBlock;                  // Current block being allocated off
+       int nErasedBlocks;
+       int allocationBlock;    // Current block being allocated off

        __u32 allocationPage;
        __u32 allocationPage;

-       int   allocationBlockFinder;    // Used to search for next allocation block
-       
+       int allocationBlockFinder;      // Used to search for next allocation block
+

        // Runtime state
        // Runtime state

-       int   nTnodesCreated;   
+       int nTnodesCreated;

        yaffs_Tnode *freeTnodes;
        yaffs_Tnode *freeTnodes;

-       int  nFreeTnodes;
+       int nFreeTnodes;

        yaffs_TnodeList *allocatedTnodeList;
 
        yaffs_TnodeList *allocatedTnodeList;
 

-       int   isDoingGC;
+       int isDoingGC;

 
 

-       int   nObjectsCreated;
+       int nObjectsCreated;

        yaffs_Object *freeObjects;
        yaffs_Object *freeObjects;

-       int   nFreeObjects;
+       int nFreeObjects;

 
        yaffs_ObjectList *allocatedObjectList;
 
        yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
 
 
        yaffs_ObjectList *allocatedObjectList;
 
        yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
 

-       int       nFreeChunks;
-               
-       int   currentDirtyChecker;      // Used to find current dirtiest block
-       
-       __u32  *gcCleanupList; // objects to delete at the end of a GC. 
-       
+       int nFreeChunks;
+
+       int currentDirtyChecker;        // Used to find current dirtiest block
+
+       __u32 *gcCleanupList;   // objects to delete at the end of a GC. 
+

        // Operations since mount
        int nPageWrites;
        int nPageReads;
        // Operations since mount
        int nPageWrites;
        int nPageReads;


@@ -621,13 +585,14 @@ struct yaffs_DeviceStruct
        int tagsEccUnfixed;
        int nDeletions;
        int nUnmarkedDeletions;
        int tagsEccUnfixed;
        int nDeletions;
        int nUnmarkedDeletions;

-       
+

        yaffs_Object *rootDir;
        yaffs_Object *lostNFoundDir;
        yaffs_Object *rootDir;
        yaffs_Object *lostNFoundDir;

+
+       // Buffer areas for storing data to recover from write failures TODO
+       //      __u8            bufferedData[YAFFS_CHUNKS_PER_BLOCK][YAFFS_BYTES_PER_CHUNK];
+       //      yaffs_Spare bufferedSpare[YAFFS_CHUNKS_PER_BLOCK];

        
        

-       // Buffer areas for storing data to recover from write failures
-//     __u8            bufferedData[YAFFS_CHUNKS_PER_BLOCK][YAFFS_BYTES_PER_CHUNK];
-//     yaffs_Spare bufferedSpare[YAFFS_CHUNKS_PER_BLOCK];

        int bufferedBlock;      // Which block is buffered here?
        int doingBufferedBlockRewrite;
 
        int bufferedBlock;      // Which block is buffered here?
        int doingBufferedBlockRewrite;
 


@@ -637,123 +602,124 @@ struct yaffs_DeviceStruct
        int cacheHits;
 
        // Stuff for background deletion and unlinked files.
        int cacheHits;
 
        // Stuff for background deletion and unlinked files.

-       yaffs_Object *unlinkedDir;              // Directory where unlinked and deleted files live.
-       yaffs_Object *deletedDir;               // Directory where deleted objects are sent to disappear.
+       yaffs_Object *unlinkedDir;      // Directory where unlinked and deleted files live.
+       yaffs_Object *deletedDir;       // Directory where deleted objects are sent to disappear.

        yaffs_Object *unlinkedDeletion; // Current file being background deleted.
        yaffs_Object *unlinkedDeletion; // Current file being background deleted.

-       int nDeletedFiles;                              // Count of files awaiting deletion;
-       int nUnlinkedFiles;                             // Count of unlinked files. 
-       int nBackgroundDeletions;                       // Count of background deletions.       
-       
+       int nDeletedFiles;      // Count of files awaiting deletion;
+       int nUnlinkedFiles;     // Count of unlinked files. 
+       int nBackgroundDeletions;       // Count of background deletions.       
+

        //__u8 *localBuffer;
        //__u8 *localBuffer;

-       
+

        yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
        int maxTemp;
        int unmanagedTempAllocations;
        int unmanagedTempDeallocations;
        yaffs_TempBuffer tempBuffer[YAFFS_N_TEMP_BUFFERS];
        int maxTemp;
        int unmanagedTempAllocations;
        int unmanagedTempDeallocations;

-       
+

        // yaffs2 runtime stuff
        // yaffs2 runtime stuff

-       unsigned sequenceNumber;                //Sequence number of currently allocating block
+       unsigned sequenceNumber;        //Sequence number of currently allocating block

        unsigned oldestDirtySequence;
        unsigned oldestDirtySequence;

-       
+

 };
 
 typedef struct yaffs_DeviceStruct yaffs_Device;
 
 };
 
 typedef struct yaffs_DeviceStruct yaffs_Device;
 

-

 // Function to manipulate block info
 // Function to manipulate block info

-static  Y_INLINE yaffs_BlockInfo* yaffs_GetBlockInfo(yaffs_Device *dev, int blk)
+static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)

 {
 {

-       if(blk < dev->internalStartBlock || blk > dev->internalEndBlock)
-       {
-               T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),blk));
+       if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
+               T(YAFFS_TRACE_ERROR,
+                 (TSTR
+                  ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
+                  blk));

                YBUG();
        }
        return &dev->blockInfo[blk - dev->internalStartBlock];
 }
 
                YBUG();
        }
        return &dev->blockInfo[blk - dev->internalStartBlock];
 }
 

-

 //////////// YAFFS Functions //////////////////
 
 //////////// YAFFS Functions //////////////////
 

-int yaffs_GutsInitialise(yaffs_Device *dev);
-void yaffs_Deinitialise(yaffs_Device *dev);
-
-int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
+int yaffs_GutsInitialise(yaffs_Device * dev);
+void yaffs_Deinitialise(yaffs_Device * dev);

 
 

+int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev);

 
 // Rename
 
 // Rename

-int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName, yaffs_Object *newDir, const YCHAR *newName);
+int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
+                      yaffs_Object * newDir, const YCHAR * newName);

 
 // generic Object functions
 
 // generic Object functions

-int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name);
-int yaffs_DeleteFile(yaffs_Object *obj);
+int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name);
+int yaffs_DeleteFile(yaffs_Object * obj);

 
 // Object access functions.
 
 // Object access functions.

-int yaffs_GetObjectName(yaffs_Object *obj,YCHAR *name,int buffSize);
-int yaffs_GetObjectFileLength(yaffs_Object *obj);
-int yaffs_GetObjectInode(yaffs_Object *obj);
-unsigned yaffs_GetObjectType(yaffs_Object *obj);
-int yaffs_GetObjectLinkCount(yaffs_Object *obj);
+int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize);
+int yaffs_GetObjectFileLength(yaffs_Object * obj);
+int yaffs_GetObjectInode(yaffs_Object * obj);
+unsigned yaffs_GetObjectType(yaffs_Object * obj);
+int yaffs_GetObjectLinkCount(yaffs_Object * obj);

 
 // Change inode attributes
 
 // Change inode attributes

-int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
+int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr);
+int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);

 
 // File operations
 
 // File operations

-int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, __u32 offset, int nBytes);
-int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, __u32 offset, int nBytes, int writeThrough);
-int yaffs_ResizeFile(yaffs_Object *obj, int newSize);
-
-yaffs_Object *yaffs_MknodFile(yaffs_Object *parent,const YCHAR *name, __u32 mode, __u32 uid, __u32 gid);
-int yaffs_FlushFile(yaffs_Object *obj,int updateTime);
+int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, __u32 offset,
+                          int nBytes);
+int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, __u32 offset,
+                         int nBytes, int writeThrough);
+int yaffs_ResizeFile(yaffs_Object * obj, int newSize);

 
 

+yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
+                             __u32 mode, __u32 uid, __u32 gid);
+int yaffs_FlushFile(yaffs_Object * obj, int updateTime);

 
 // Directory operations
 
 // Directory operations

-yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent,const YCHAR *name, __u32 mode, __u32 uid, __u32 gid);
-yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir,const YCHAR *name);
-int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,int (*fn)(yaffs_Object *));
+yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
+                                  __u32 mode, __u32 uid, __u32 gid);
+yaffs_Object *yaffs_FindObjectByName(yaffs_Object * theDir, const YCHAR * name);
+int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
+                                  int (*fn) (yaffs_Object *));

 
 

-yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev,__u32 number);
+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number);

 
 // Link operations
 
 // Link operations

-yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name, yaffs_Object *equivalentObject);
+yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
+                        yaffs_Object * equivalentObject);

 
 

-yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj);

 
 // Symlink operations
 
 // Symlink operations

-yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name, __u32 mode,  __u32 uid, __u32 gid, const YCHAR *alias);
-YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj);
+yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
+                                __u32 mode, __u32 uid, __u32 gid,
+                                const YCHAR * alias);
+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj);

 
 // Special inodes (fifos, sockets and devices)
 
 // Special inodes (fifos, sockets and devices)

-yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent,const YCHAR *name, __u32 mode, __u32 uid, __u32 gid,__u32 rdev);
-
+yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
+                                __u32 mode, __u32 uid, __u32 gid, __u32 rdev);

 
 // Special directories
 
 // Special directories

-yaffs_Object *yaffs_Root(yaffs_Device *dev);
-yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);
+yaffs_Object *yaffs_Root(yaffs_Device * dev);
+yaffs_Object *yaffs_LostNFound(yaffs_Device * dev);

 
 #ifdef CONFIG_YAFFS_WINCE
 // CONFIG_YAFFS_WINCE special stuff
 
 #ifdef CONFIG_YAFFS_WINCE
 // CONFIG_YAFFS_WINCE special stuff

-void  yfsd_WinFileTimeNow(__u32 target[2]);
+void yfsd_WinFileTimeNow(__u32 target[2]);

 #endif
 
 #ifdef __KERNEL__
 
 #endif
 
 #ifdef __KERNEL__
 

-void yaffs_HandleDeferedFree(yaffs_Object *obj);
+void yaffs_HandleDeferedFree(yaffs_Object * obj);

 #endif
 
 #endif
 

-
-
-

 // Debug dump 
 // Debug dump 

-int yaffs_DumpObject(yaffs_Object *obj);
-
+int yaffs_DumpObject(yaffs_Object * obj);

 
 

-void yaffs_GutsTest(yaffs_Device *dev);
+void yaffs_GutsTest(yaffs_Device * dev);

 
 

-
-void yaffs_InitialiseTags(yaffs_ExtendedTags *tags);
-void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId,int markNAND,int lyn);
-int yaffs_CheckFF(__u8 *buffer,int nBytes);
+void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
+void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn);
+int yaffs_CheckFF(__u8 * buffer, int nBytes);

 
 #endif
 
 #endif

-