Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup in perform_atareset().

This commit is contained in:
phx 2012-01-22 13:16:54 +00:00
parent b3662b7bde
commit 9077ae621d
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/arch/sandpoint/stand/altboot/dsk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dsk.c,v 1.13 2012/01/22 13:08:16 phx Exp $ */
/* $NetBSD: dsk.c,v 1.14 2012/01/22 13:16:54 phx Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@ -179,19 +179,14 @@ int
perform_atareset(struct dkdev_ata *l, int n)
{
struct dvata_chan *chan = &l->chan[n];
// int retries;
// for (retries = 0; retries < 10; retries++) {
CSR_WRITE_1(chan->ctl, ATA_DREQ);
delay(10);
CSR_WRITE_1(chan->ctl, ATA_SRST|ATA_DREQ);
delay(10);
CSR_WRITE_1(chan->ctl, ATA_DREQ);
// if (spinwait_unbusy(l, n, 1000/*250*/, NULL) != 0)
// return 1;
// delay(1000 * 1000);
// }
return spinwait_unbusy(l, n, 1000/*250*/, NULL);
CSR_WRITE_1(chan->ctl, ATA_DREQ);
delay(10);
CSR_WRITE_1(chan->ctl, ATA_SRST|ATA_DREQ);
delay(10);
CSR_WRITE_1(chan->ctl, ATA_DREQ);
return spinwait_unbusy(l, n, 1000, NULL);
}
/* clear idle and standby timers to spin up the drive */