qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 21:05:18 +02:00
Code

code style cleanup jz4740_nand.c

Browse Source
This commit is contained in:
Xiangfu Liu 2009-10-04 11:42:27 -04:00
parent ce96b1f2a5
commit 3dde1ac212
1 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
target/linux/xburst/files-2.6.31/drivers/mtd/nand/jz4740_nand.c
View File

@ -127,7 +127,7 @@ static void jz_nand_hwctl(struct mtd_info *mtd, int mode)
} }
static int jz_nand_calculate_ecc_rs(struct mtd_info* mtd, const uint8_t* dat, static int jz_nand_calculate_ecc_rs(struct mtd_info* mtd, const uint8_t* dat,
uint8_t *ecc_code) uint8_t *ecc_code)
{ {
struct jz_nand *nand = mtd_to_jz_nand(mtd); struct jz_nand *nand = mtd_to_jz_nand(mtd);
uint32_t reg, status; uint32_t reg, status;
@ -150,46 +150,46 @@ static int jz_nand_calculate_ecc_rs(struct mtd_info* mtd, const uint8_t* dat,
static void correct_data(uint8_t *dat, int index, int mask) static void correct_data(uint8_t *dat, int index, int mask)
{ {
int offset = index & 0x7; int offset = index & 0x7;
uint16_t data; uint16_t data;
printk("correct: "); printk("correct: ");
index += (index >> 3); index += (index >> 3);
data = dat[index]; data = dat[index];
data |= dat[index+1] << 8; data |= dat[index+1] << 8;
printk("0x%x -> ", data); printk("0x%x -> ", data);
mask ^= (data >> offset) & 0x1ff; mask ^= (data >> offset) & 0x1ff;
data &= ~(0x1ff << offset); data &= ~(0x1ff << offset);
data |= (mask << offset); data |= (mask << offset);
printk("0x%x\n", data); printk("0x%x\n", data);
dat[index] = data & 0xff; dat[index] = data & 0xff;
dat[index+1] = (data >> 8) & 0xff; dat[index+1] = (data >> 8) & 0xff;
} }
static int jz_nand_correct_ecc_rs(struct mtd_info* mtd, uint8_t *dat, static int jz_nand_correct_ecc_rs(struct mtd_info* mtd, uint8_t *dat,
uint8_t *read_ecc, uint8_t *calc_ecc) uint8_t *read_ecc, uint8_t *calc_ecc)
{ {
struct jz_nand *nand = mtd_to_jz_nand(mtd); struct jz_nand *nand = mtd_to_jz_nand(mtd);
int i, error_count, index; int i, error_count, index;
uint32_t reg, status, error; uint32_t reg, status, error;
for(i = 0; i < 9; ++i) { for(i = 0; i < 9; ++i) {
if (read_ecc[i] != 0xff) if (read_ecc[i] != 0xff)
break; break;
} }
if (i == 9) { if (i == 9) {
for (i = 0; i < nand->chip.ecc.size; ++i) { for (i = 0; i < nand->chip.ecc.size; ++i) {
if (dat[i] != 0xff) if (dat[i] != 0xff)
break; break;
} }
if (i == nand->chip.ecc.size) if (i == nand->chip.ecc.size)
return 0; return 0;
} }
for(i = 0; i < 9; ++i) for(i = 0; i < 9; ++i)
writeb(read_ecc[i], nand->base + JZ_REG_NAND_PAR0 + i); writeb(read_ecc[i], nand->base + JZ_REG_NAND_PAR0 + i);
@ -206,30 +206,29 @@ static int jz_nand_correct_ecc_rs(struct mtd_info* mtd, uint8_t *dat,
reg &= ~JZ_NAND_ECC_CTRL_ENABLE; reg &= ~JZ_NAND_ECC_CTRL_ENABLE;
writel(reg, nand->base + JZ_REG_NAND_ECC_CTRL); writel(reg, nand->base + JZ_REG_NAND_ECC_CTRL);
if (status & JZ_NAND_STATUS_ERROR) { if (status & JZ_NAND_STATUS_ERROR) {
if (status & JZ_NAND_STATUS_UNCOR_ERROR) { if (status & JZ_NAND_STATUS_UNCOR_ERROR) {
printk("uncorrectable ecc:"); printk("uncorrectable ecc:");
for(i = 0; i < 9; ++i) for(i = 0; i < 9; ++i)
printk(" 0x%x", read_ecc[i]); printk(" 0x%x", read_ecc[i]);
printk("\n"); printk("\n");
printk("uncorrectable data:"); printk("uncorrectable data:");
for(i = 0; i < 32; ++i) for(i = 0; i < 32; ++i)
printk(" 0x%x", dat[i]); printk(" 0x%x", dat[i]);
printk("\n"); printk("\n");
return -1; return -1;
} }
error_count = (status & JZ_NAND_STATUS_ERR_COUNT) >> 29; error_count = (status & JZ_NAND_STATUS_ERR_COUNT) >> 29;
printk("error_count: %d %x\n", error_count, status); printk("error_count: %d %x\n", error_count, status);
for(i = 0;i < error_count; ++i) { for(i = 0; i < error_count; ++i) {
error = readl(nand->base + JZ_REG_NAND_ERR(i)); error = readl(nand->base + JZ_REG_NAND_ERR(i));
index = ((error >> 16) & 0x1ff) - 1; index = ((error >> 16) & 0x1ff) - 1;
if (index >= 0 && index < 512) { if (index >= 0 && index < 512) {
correct_data(dat, index, error & 0x1ff); correct_data(dat, index, error & 0x1ff);
} }
} }
return error_count; return error_count;