projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs : Change the way yaffs direct handles permissions for open etc.
[yaffs2.git]
/
yaffs_ecc.c
diff --git
a/yaffs_ecc.c
b/yaffs_ecc.c
index d037e90a2472c39b032096dd344b5f0f86e9ce97..4030908d518178c01de13b195290a3970337e627 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.
*
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-20
07
Aleph One Ltd.
+ * Copyright (C) 2002-20
10
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>
@@
-28,9
+28,6
@@
* this bytes influence on the line parity.
*/
* this bytes influence on the line parity.
*/
-const char *yaffs_ecc_c_version =
- "$Id: yaffs_ecc.c,v 1.11 2009-03-06 17:20:50 wookey Exp $";
-
#include "yportenv.h"
#include "yaffs_ecc.h"
#include "yportenv.h"
#include "yaffs_ecc.h"
@@
-72,7
+69,7
@@
static const unsigned char column_parity_table[] = {
/* Count the bits in an unsigned char or a U32 */
/* Count the bits in an unsigned char or a U32 */
-static int yaffs_
CountB
its(unsigned char x)
+static int yaffs_
count_b
its(unsigned char x)
{
int r = 0;
while (x) {
{
int r = 0;
while (x) {
@@
-83,7
+80,7
@@
static int yaffs_CountBits(unsigned char x)
return r;
}
return r;
}
-static int yaffs_
CountB
its32(unsigned x)
+static int yaffs_
count_b
its32(unsigned x)
{
int r = 0;
while (x) {
{
int r = 0;
while (x) {
@@
-95,7
+92,7
@@
static int yaffs_CountBits32(unsigned x)
}
/* Calculate the ECC for a 256-byte block of data */
}
/* Calculate the ECC for a 256-byte block of data */
-void yaffs_
ECCCalculate
(const unsigned char *data, unsigned char *ecc)
+void yaffs_
ecc_cacl
(const unsigned char *data, unsigned char *ecc)
{
unsigned int i;
{
unsigned int i;
@@
-166,7
+163,7
@@
void yaffs_ECCCalculate(const unsigned char *data, unsigned char *ecc)
/* Correct the ECC on a 256 byte block of data */
/* Correct the ECC on a 256 byte block of data */
-int yaffs_
ECCC
orrect(unsigned char *data, unsigned char *read_ecc,
+int yaffs_
ecc_c
orrect(unsigned char *data, unsigned char *read_ecc,
const unsigned char *test_ecc)
{
unsigned char d0, d1, d2; /* deltas */
const unsigned char *test_ecc)
{
unsigned char d0, d1, d2; /* deltas */
@@
-226,9
+223,9
@@
int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
return 1; /* Corrected the error */
}
return 1; /* Corrected the error */
}
- if ((yaffs_
CountB
its(d0) +
- yaffs_
CountB
its(d1) +
- yaffs_
CountB
its(d2)) == 1) {
+ if ((yaffs_
count_b
its(d0) +
+ yaffs_
count_b
its(d1) +
+ yaffs_
count_b
its(d2)) == 1) {
/* Reccoverable error in ecc */
read_ecc[0] = test_ecc[0];
/* Reccoverable error in ecc */
read_ecc[0] = test_ecc[0];
@@
-248,7
+245,7
@@
int yaffs_ECCCorrect(unsigned char *data, unsigned char *read_ecc,
/*
* ECCxxxOther does ECC calcs on arbitrary n bytes of data
*/
/*
* ECCxxxOther does ECC calcs on arbitrary n bytes of data
*/
-void yaffs_
ECCCalculateOther(const unsigned char *data, unsigned nB
ytes,
+void yaffs_
ecc_calc_other(const unsigned char *data, unsigned n_b
ytes,
yaffs_ECCOther *eccOther)
{
unsigned int i;
yaffs_ECCOther *eccOther)
{
unsigned int i;
@@
-258,7
+255,7
@@
void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
unsigned line_parity_prime = 0;
unsigned char b;
unsigned line_parity_prime = 0;
unsigned char b;
- for (i = 0; i < n
B
ytes; i++) {
+ for (i = 0; i < n
_b
ytes; i++) {
b = column_parity_table[*data++];
col_parity ^= b;
b = column_parity_table[*data++];
col_parity ^= b;
@@
-275,7
+272,7
@@
void yaffs_ECCCalculateOther(const unsigned char *data, unsigned nBytes,
eccOther->lineParityPrime = line_parity_prime;
}
eccOther->lineParityPrime = line_parity_prime;
}
-int yaffs_
ECCCorrectOther(unsigned char *data, unsigned nB
ytes,
+int yaffs_
ecc_correct_other(unsigned char *data, unsigned n_b
ytes,
yaffs_ECCOther *read_ecc,
const yaffs_ECCOther *test_ecc)
{
yaffs_ECCOther *read_ecc,
const yaffs_ECCOther *test_ecc)
{
@@
-304,7
+301,7
@@
int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
if (cDelta & 0x02)
bit |= 0x01;
if (cDelta & 0x02)
bit |= 0x01;
- if (lDelta >= n
B
ytes)
+ if (lDelta >= n
_b
ytes)
return -1;
data[lDelta] ^= (1 << bit);
return -1;
data[lDelta] ^= (1 << bit);
@@
-312,8
+309,8
@@
int yaffs_ECCCorrectOther(unsigned char *data, unsigned nBytes,
return 1; /* corrected */
}
return 1; /* corrected */
}
- if ((yaffs_
CountBits32(lDelta) + yaffs_CountB
its32(lDeltaPrime) +
- yaffs_
CountB
its(cDelta)) == 1) {
+ if ((yaffs_
count_bits32(lDelta) + yaffs_count_b
its32(lDeltaPrime) +
+ yaffs_
count_b
its(cDelta)) == 1) {
/* Reccoverable error in ecc */
*read_ecc = *test_ecc;
/* Reccoverable error in ecc */
*read_ecc = *test_ecc;