minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-16 07:27:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing coding style issues

Browse Source 
- Fixing leading white spaces
 - Fixing indentation where 4 spaces are used instead of tab
 - Removing C++ comments (//), wherever I introduced them

Signed-off-by: William Juul <william.juul@tandberg.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
William Juul 2007-11-09 13:32:30 +01:00 committed by Scott Wood
parent 4cbb651b29
commit 5e1dae5c3d
18 changed files with 106 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/delta/nand.c
View File

@ -549,7 +549,7 @@ int board_nand_init(struct nand_chip *nand)
nand->write_buf = dfc_write_buf; nand->write_buf = dfc_write_buf;
nand->cmdfunc = dfc_cmdfunc; nand->cmdfunc = dfc_cmdfunc;
// nand->autooob = &delta_oob; /* nand->autooob = &delta_oob; */
nand->badblock_pattern = &delta_bbt_descr; nand->badblock_pattern = &delta_bbt_descr;
return 0; return 0;
} }

2
board/zylonite/nand.c
View File

@ -553,7 +553,7 @@ int board_nand_init(struct nand_chip *nand)
nand->write_buf = dfc_write_buf; nand->write_buf = dfc_write_buf;
nand->cmdfunc = dfc_cmdfunc; nand->cmdfunc = dfc_cmdfunc;
// nand->autooob = &delta_oob; /* nand->autooob = &delta_oob; */
nand->badblock_pattern = &delta_bbt_descr; nand->badblock_pattern = &delta_bbt_descr;
return 0; return 0;
} }

78
common/cmd_nand.c
View File

@ -340,7 +340,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
opts.length = size; opts.length = size;
opts.offset = off; opts.offset = off;
opts.quiet = quiet; opts.quiet = quiet;
// ret = nand_read_opts(nand, &opts); /* ret = nand_read_opts(nand, &opts); */
} else { } else {
/* write */ /* write */
mtd_oob_ops_t opts; mtd_oob_ops_t opts;
@ -406,44 +406,48 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
} }
if (status) { if (status) {
// ulong block_start = 0;
ulong off; ulong off;
// int last_status = -1; /* ulong block_start = 0;
int last_status = -1;
*/
struct nand_chip *nand_chip = nand->priv; struct nand_chip *nand_chip = nand->priv;
/* check the WP bit */ /* check the WP bit */
nand_chip->cmdfunc (nand, NAND_CMD_STATUS, -1, -1); nand_chip->cmdfunc (nand, NAND_CMD_STATUS, -1, -1);
printf("device is %swrite protected\n", printf("device is %swrite protected\n",
(nand_chip->read_byte(nand) & 0x80 ? (nand_chip->read_byte(nand) & 0x80 ?
"NOT " : "" ) ); "NOT " : ""));
for (off = 0; off < nand->size; off += nand->writesize) { for (off = 0; off < nand->size; off += nand->writesize) {
// int s = nand_get_lock_status(nand, off); #if 0 /* must be fixed */
// int s = nand_get_lock_status(nand, off);
// /* print message only if status has changed
// * or at end of chip /* print message only if status has changed
// */ * or at end of chip
// if (off == nand->size - nand->writesize */
// || (s != last_status && off != 0)) { if (off == nand->size - nand->writesize
// || (s != last_status && off != 0)) {
// printf("%08lx - %08lx: %8d pages %s%s%s\n",
// block_start, printf("%08lx - %08lx: %8d pages %s%s%s\n",
// off-1, block_start,
// (off-block_start)/nand->writesize, off-1,
// ((last_status & NAND_LOCK_STATUS_TIGHT) ? "TIGHT " : ""), (off-block_start)/nand->writesize,
// ((last_status & NAND_LOCK_STATUS_LOCK) ? "LOCK " : ""), ((last_status & NAND_LOCK_STATUS_TIGHT) ? "TIGHT " : ""),
// ((last_status & NAND_LOCK_STATUS_UNLOCK) ? "UNLOCK " : "")); ((last_status & NAND_LOCK_STATUS_LOCK) ? "LOCK " : ""),
// } ((last_status & NAND_LOCK_STATUS_UNLOCK) ? "UNLOCK " : ""));
// }
// last_status = s;
last_status = s;
#endif
} }
} else { } else {
// if (!nand_lock(nand, tight)) { #if 0 /* must be fixed */
// puts("NAND flash successfully locked\n"); if (!nand_lock(nand, tight)) {
// } else { puts("NAND flash successfully locked\n");
// puts("Error locking NAND flash\n"); } else {
// return 1; puts("Error locking NAND flash\n");
// } return 1;
}
#endif
} }
return 0; return 0;
} }
@ -452,13 +456,15 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
if (arg_off_size(argc - 2, argv + 2, nand, &off, &size) < 0) if (arg_off_size(argc - 2, argv + 2, nand, &off, &size) < 0)
return 1; return 1;
// if (!nand_unlock(nand, off, size)) { #if 0 /* must be fixed */
// puts("NAND flash successfully unlocked\n"); if (!nand_unlock(nand, off, size)) {
// } else { puts("NAND flash successfully unlocked\n");
// puts("Error unlocking NAND flash, " } else {
// "write and erase will probably fail\n"); puts("Error unlocking NAND flash, "
// return 1; "write and erase will probably fail\n");
// } return 1;
}
#endif
return 0; return 0;
} }

2
cpu/arm926ejs/davinci/nand.c
View File

@ -373,7 +373,7 @@ int board_nand_init(struct nand_chip *nand)
#else #else
#error "Either CFG_NAND_LARGEPAGE or CFG_NAND_SMALLPAGE must be defined!" #error "Either CFG_NAND_LARGEPAGE or CFG_NAND_SMALLPAGE must be defined!"
#endif #endif
// nand->autooob = &davinci_nand_oobinfo; /* nand->autooob = &davinci_nand_oobinfo; */
nand->ecc.calculate = nand_davinci_calculate_ecc; nand->ecc.calculate = nand_davinci_calculate_ecc;
nand->ecc.correct = nand_davinci_correct_data; nand->ecc.correct = nand_davinci_correct_data;
nand->ecc.hwctl = nand_davinci_enable_hwecc; nand->ecc.hwctl = nand_davinci_enable_hwecc;

10
drivers/mtd/nand/diskonchip.c
View File

@ -500,11 +500,11 @@ static u_char doc2001_read_byte(struct mtd_info *mtd)
struct doc_priv *doc = this->priv; struct doc_priv *doc = this->priv;
void __iomem *docptr = doc->virtadr; void __iomem *docptr = doc->virtadr;
//ReadDOC(docptr, CDSNSlowIO); /*ReadDOC(docptr, CDSNSlowIO); */
/* 11.4.5 -- delay twice to allow extended length cycle */ /* 11.4.5 -- delay twice to allow extended length cycle */
DoC_Delay(doc, 2); DoC_Delay(doc, 2);
ReadDOC(docptr, ReadPipeInit); ReadDOC(docptr, ReadPipeInit);
//return ReadDOC(docptr, Mil_CDSN_IO); /*return ReadDOC(docptr, Mil_CDSN_IO); */
return ReadDOC(docptr, LastDataRead); return ReadDOC(docptr, LastDataRead);
} }
@ -1051,7 +1051,7 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat,
return ret; return ret;
} }
//u_char mydatabuf[528]; /*u_char mydatabuf[528]; */
/* The strange out-of-order .oobfree list below is a (possibly unneeded) /* The strange out-of-order .oobfree list below is a (possibly unneeded)
* attempt to retain compatibility. It used to read: * attempt to retain compatibility. It used to read:
@ -1623,11 +1623,11 @@ static int __init doc_probe(unsigned long physadr)
if (ChipID == DOC_ChipID_DocMilPlus16) { if (ChipID == DOC_ChipID_DocMilPlus16) {
WriteDOC(~newval, virtadr, Mplus_AliasResolution); WriteDOC(~newval, virtadr, Mplus_AliasResolution);
oldval = ReadDOC(doc->virtadr, Mplus_AliasResolution); oldval = ReadDOC(doc->virtadr, Mplus_AliasResolution);
WriteDOC(newval, virtadr, Mplus_AliasResolution); // restore it WriteDOC(newval, virtadr, Mplus_AliasResolution); /* restore it */
} else { } else {
WriteDOC(~newval, virtadr, AliasResolution); WriteDOC(~newval, virtadr, AliasResolution);
oldval = ReadDOC(doc->virtadr, AliasResolution); oldval = ReadDOC(doc->virtadr, AliasResolution);
WriteDOC(newval, virtadr, AliasResolution); // restore it WriteDOC(newval, virtadr, AliasResolution); /* restore it */
} }
newval = ~newval; newval = ~newval;
if (oldval == newval) { if (oldval == newval) {

2
drivers/mtd/nand/nand_base.c
View File

@ -2557,7 +2557,7 @@ int nand_scan_tail(struct mtd_info *mtd)
default: default:
printk(KERN_WARNING "No oob scheme defined for " printk(KERN_WARNING "No oob scheme defined for "
"oobsize %d\n", mtd->oobsize); "oobsize %d\n", mtd->oobsize);
// BUG(); /* BUG(); */
} }
} }

1
include/linux/mtd/nand.h
View File

@ -236,6 +236,7 @@ struct nand_chip;
* used instead of the per chip wait queue when a hw controller is available * used instead of the per chip wait queue when a hw controller is available
*/ */
struct nand_hw_control { struct nand_hw_control {
/* XXX U-BOOT XXX */
#if 0 #if 0
spinlock_t lock; spinlock_t lock;
wait_queue_head_t wq; wait_queue_head_t wq;