yaffs Fix incorrect handling of deletion flag

[yaffs2.git] / yaffs_ecc.c

diff --git a/yaffs_ecc.c b/yaffs_ecc.c
index 9f5973a5b69b1be6f80d7ea1bc99923f8ca07a89..da6145aac27a1c3f8a583ea009ca70aecc9e1f79 100644 (file)
--- a/yaffs_ecc.c
+++ b/yaffs_ecc.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -28,9 +28,6 @@
  * this bytes influence on the line parity.
  */
 
-const char *yaffs_ecc_c_version =
-    "$Id: yaffs_ecc.c,v 1.10 2007-12-13 15:35:17 wookey Exp $";
-
 #include "yportenv.h"
 
 #include "yaffs_ecc.h"
@@ -109,12 +106,10 @@ void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc)
                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;
                }
-
        }
 
        ecc[2] = (~col_parity) | 0x03;
@@ -158,7 +153,7 @@ void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc)
        ecc[0] = ~t;
 
 #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
-       // Swap the bytes into the wrong order
+       /* Swap the bytes into the wrong order */
        t = ecc[0];
        ecc[0] = ecc[1];
        ecc[1] = t;
@@ -189,7 +184,7 @@ int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
                unsigned bit;
 
 #ifdef CONFIG_YAFFS_ECC_WRONG_ORDER
-               // swap the bytes to correct for the wrong order
+               /* swap the bytes to correct for the wrong order */
                unsigned char t;
 
                t = d0;
@@ -251,7 +246,7 @@ int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
  */
 void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
-                            yaffs_ECCOther * eccOther)
+                               yaffs_ECCOther *eccOther)
 {
        unsigned int i;
 
@@ -278,8 +273,8 @@ void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
 }
 
 int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
-                         yaffs_ECCOther * read_ecc,
-                         const yaffs_ECCOther * test_ecc)
+                       yaffs_ECCOther *read_ecc,
+                       const yaffs_ECCOther *test_ecc)
 {
        unsigned char cDelta;   /* column parity delta */
        unsigned lDelta;        /* line parity delta */
@@ -294,8 +289,7 @@ int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
                return 0; /* no error */
 
        if (lDelta == ~lDeltaPrime &&
-           (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15))
-       {
+           (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
                /* Single bit (recoverable) error in data */
 
                bit = 0;
@@ -307,7 +301,7 @@ int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
                if (cDelta & 0x02)
                        bit |= 0x01;
 
-               if(lDelta >= nBytes)
+               if (lDelta >= nBytes)
                        return -1;
 
                data[lDelta] ^= (1 << bit);
@@ -316,7 +310,7 @@ int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
        }
 
        if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
-            yaffs_CountBits(cDelta)) == 1) {
+                       yaffs_CountBits(cDelta)) == 1) {
                /* Reccoverable error in ecc */
 
                *read_ecc = *test_ecc;
@@ -326,6 +320,4 @@ int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
        /* Unrecoverable error */
 
        return -1;
-
 }
-