diff options
| author | Søren Schmidt <sos@FreeBSD.org> | 2000-10-22 12:16:00 +0000 |
|---|---|---|
| committer | Søren Schmidt <sos@FreeBSD.org> | 2000-10-22 12:16:00 +0000 |
| commit | d29f653d3a9ba5e3df00371c76947c830d8b033a (patch) | |
| tree | cfa331402279bc22386ffea9747e2f1a02a75e24 /sys/dev | |
| parent | 241d880ebb76903620173b70435c890310e291e1 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/ata-all.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index b5e9ce0bf57dd..a5397254d0eee 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -1236,7 +1236,7 @@ ata_reset(struct ata_softc *scp, int *mask) DELAY(1); inb(scp->ioaddr + ATA_STATUS); outb(scp->altioaddr, ATA_A_IDS | ATA_A_RESET); - DELAY(10000); + DELAY(100000); outb(scp->altioaddr, ATA_A_IDS); DELAY(10000); inb(scp->ioaddr + ATA_ERROR); @@ -1462,9 +1462,6 @@ ata_command(struct ata_softc *scp, int device, u_int8_t command, switch (flags) { case ATA_WAIT_INTR: - if (scp->active != ATA_IDLE) - ata_printf(scp, device, "WARNING: WAIT_INTR active=%s\n", - active2str(scp->active)); scp->active = ATA_WAIT_INTR; asleep((caddr_t)scp, PRIBIO, "atacmd", 10 * hz); outb(scp->ioaddr + ATA_CMD, command); @@ -1481,9 +1478,6 @@ ata_command(struct ata_softc *scp, int device, u_int8_t command, break; case ATA_WAIT_READY: - if (scp->active != ATA_IDLE && scp->active != ATA_REINITING) - ata_printf(scp, device, "WARNING: WAIT_READY active=%s\n", - active2str(scp->active)); if (scp->active != ATA_REINITING) scp->active = ATA_WAIT_READY; outb(scp->ioaddr + ATA_CMD, command); |