yaffs: More clean up

[yaffs2.git] / yaffs_ecc.c

diff --git a/yaffs_ecc.c b/yaffs_ecc.c
index 71ebe765c9d29bd40056d28097128045fd3f3503..290f8d34644242f53a66d997b57f9e93167633ca 100644 (file)
--- a/yaffs_ecc.c
+++ b/yaffs_ecc.c
@@ -245,8 +245,8 @@ int yaffs_ecc_correct(unsigned char *data, unsigned char *read_ecc,
 /*
  * ECCxxxOther does ECC calcs on arbitrary n bytes of data
  */
-void yaffs_ecc_calc_other(const unsigned char *data, unsigned nBytes,
-                               yaffs_ECCOther *eccOther)
+void yaffs_ecc_calc_other(const unsigned char *data, unsigned n_bytes,
+                               struct yaffs_ecc_other *ecc_other)
 {
        unsigned int i;
 
@@ -255,7 +255,7 @@ void yaffs_ecc_calc_other(const unsigned char *data, unsigned nBytes,
        unsigned line_parity_prime = 0;
        unsigned char b;
 
-       for (i = 0; i < nBytes; i++) {
+       for (i = 0; i < n_bytes; i++) {
                b = column_parity_table[*data++];
                col_parity ^= b;
 
@@ -267,50 +267,50 @@ void yaffs_ecc_calc_other(const unsigned char *data, unsigned nBytes,
 
        }
 
-       eccOther->colParity = (col_parity >> 2) & 0x3f;
-       eccOther->lineParity = line_parity;
-       eccOther->lineParityPrime = line_parity_prime;
+       ecc_other->col_parity = (col_parity >> 2) & 0x3f;
+       ecc_other->line_parity = line_parity;
+       ecc_other->line_parity_prime = line_parity_prime;
 }
 
-int yaffs_ecc_correct_other(unsigned char *data, unsigned nBytes,
-                       yaffs_ECCOther *read_ecc,
-                       const yaffs_ECCOther *test_ecc)
+int yaffs_ecc_correct_other(unsigned char *data, unsigned n_bytes,
+                       struct yaffs_ecc_other *read_ecc,
+                       const struct yaffs_ecc_other *test_ecc)
 {
-       unsigned char cDelta;   /* column parity delta */
-       unsigned lDelta;        /* line parity delta */
-       unsigned lDeltaPrime;   /* line parity delta */
+       unsigned char delta_col;        /* column parity delta */
+       unsigned delta_line;    /* line parity delta */
+       unsigned delta_line_prime;      /* line parity delta */
        unsigned bit;
 
-       cDelta = read_ecc->colParity ^ test_ecc->colParity;
-       lDelta = read_ecc->lineParity ^ test_ecc->lineParity;
-       lDeltaPrime = read_ecc->lineParityPrime ^ test_ecc->lineParityPrime;
+       delta_col = read_ecc->col_parity ^ test_ecc->col_parity;
+       delta_line = read_ecc->line_parity ^ test_ecc->line_parity;
+       delta_line_prime = read_ecc->line_parity_prime ^ test_ecc->line_parity_prime;
 
-       if ((cDelta | lDelta | lDeltaPrime) == 0)
+       if ((delta_col | delta_line | delta_line_prime) == 0)
                return 0; /* no error */
 
-       if (lDelta == ~lDeltaPrime &&
-           (((cDelta ^ (cDelta >> 1)) & 0x15) == 0x15)) {
+       if (delta_line == ~delta_line_prime &&
+           (((delta_col ^ (delta_col >> 1)) & 0x15) == 0x15)) {
                /* Single bit (recoverable) error in data */
 
                bit = 0;
 
-               if (cDelta & 0x20)
+               if (delta_col & 0x20)
                        bit |= 0x04;
-               if (cDelta & 0x08)
+               if (delta_col & 0x08)
                        bit |= 0x02;
-               if (cDelta & 0x02)
+               if (delta_col & 0x02)
                        bit |= 0x01;
 
-               if (lDelta >= nBytes)
+               if (delta_line >= n_bytes)
                        return -1;
 
-               data[lDelta] ^= (1 << bit);
+               data[delta_line] ^= (1 << bit);
 
                return 1; /* corrected */
        }
 
-       if ((yaffs_count_bits32(lDelta) + yaffs_count_bits32(lDeltaPrime) +
-                       yaffs_count_bits(cDelta)) == 1) {
+       if ((yaffs_count_bits32(delta_line) + yaffs_count_bits32(delta_line_prime) +
+                       yaffs_count_bits(delta_col)) == 1) {
                /* Reccoverable error in ecc */
 
                *read_ecc = *test_ecc;