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

MTD/NAND: fix nand_base.c to use get_timer() correctly

Browse Source 
This is part of the timer cleanup effort.
In the future we only use get_timer() in its intended way to
program timeout loops.
reset_timer() shall not be used anymore.

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
This commit is contained in:
Reinhard Meyer 2010-11-18 03:14:26 +00:00 committed by Scott Wood
parent 0bdecd82dd
commit 7a8fc36e6c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,11 +439,12 @@ void nand_wait_ready(struct mtd_info *mtd)
{ {
struct nand_chip *chip = mtd->priv; struct nand_chip *chip = mtd->priv;
u32 timeo = (CONFIG_SYS_HZ * 20) / 1000; u32 timeo = (CONFIG_SYS_HZ * 20) / 1000;
u32 time_start;
reset_timer(); time_start = get_timer(0);
/* wait until command is processed or timeout occures */ /* wait until command is processed or timeout occures */
while (get_timer(0) < timeo) { while (get_timer(time_start) < timeo) {
if (chip->dev_ready) if (chip->dev_ready)
if (chip->dev_ready(mtd)) if (chip->dev_ready(mtd))
break; break;
@ -704,6 +705,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this)
{ {
unsigned long timeo; unsigned long timeo;
int state = this->state; int state = this->state;
u32 time_start;
if (state == FL_ERASING) if (state == FL_ERASING)
timeo = (CONFIG_SYS_HZ * 400) / 1000; timeo = (CONFIG_SYS_HZ * 400) / 1000;
@ -715,10 +717,10 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this)
else else
this->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1); this->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);
reset_timer(); time_start = get_timer(0);
while (1) { while (1) {
if (get_timer(0) > timeo) { if (get_timer(time_start) > timeo) {
printf("Timeout!"); printf("Timeout!");
return 0x01; return 0x01;
} }
@ -732,8 +734,9 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this)
} }
} }
#ifdef PPCHAMELON_NAND_TIMER_HACK #ifdef PPCHAMELON_NAND_TIMER_HACK
reset_timer(); time_start = get_timer(0);
while (get_timer(0) < 10); while (get_timer(time_start) < 10)
;
#endif /* PPCHAMELON_NAND_TIMER_HACK */ #endif /* PPCHAMELON_NAND_TIMER_HACK */
return this->read_byte(mtd); return this->read_byte(mtd);