summaryrefslogtreecommitdiffstats
path: root/sys/dev/digi/digi_isa.c
diff options
context:
space:
mode:
authorbrian <brian@FreeBSD.org>2002-04-10 14:32:55 +0000
committerbrian <brian@FreeBSD.org>2002-04-10 14:32:55 +0000
commit509170f4fdd4981277ef3ceeb7b316809aef7646 (patch)
tree936b451fce5ff110c440e80715c4c5eede96cd23 /sys/dev/digi/digi_isa.c
parent67f2ae40b7bb0998d355aba8b77adea0e9102d9d (diff)
downloadFreeBSD-src-509170f4fdd4981277ef3ceeb7b316809aef7646.zip
FreeBSD-src-509170f4fdd4981277ef3ceeb7b316809aef7646.tar.gz
Yet another adjustment of digi_delay(). The delay is now consistent
irrespective of whether tsleep() or DELAY() is used.
Diffstat (limited to 'sys/dev/digi/digi_isa.c')
-rw-r--r--sys/dev/digi/digi_isa.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/digi/digi_isa.c b/sys/dev/digi/digi_isa.c
index 463a38b..4b606fa 100644
--- a/sys/dev/digi/digi_isa.c
+++ b/sys/dev/digi/digi_isa.c
@@ -112,12 +112,12 @@ digi_isa_check(struct digi_softc *sc)
/* Invasive probe - reset the card */
outb(sc->port, FEPRST);
- for (i = 0; i < 100; i++) {
+ for (i = 0; i < 10; i++) {
if ((inb(sc->port) & FEPMASK) == FEPRST)
break;
- digi_delay(sc, "digirst");
+ digi_delay(sc, "digirst", 1);
}
- if (i == 100)
+ if (i == 10)
return (NULL);
DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d delays\n", i));
@@ -375,12 +375,12 @@ digi_isa_attach(device_t dev)
reset |= FEPMEM;
outb(sc->port, reset);
- for (i = 0; i < 100; i++) {
+ for (i = 0; i < 10; i++) {
if ((inb(sc->port) & FEPMASK) == reset)
break;
- digi_delay(sc, "digirst1");
+ digi_delay(sc, "digirst1", 1);
}
- if (i == 100) {
+ if (i == 10) {
device_printf(dev, "1st reset failed\n");
sc->hidewin(sc);
goto failed;
@@ -397,12 +397,12 @@ digi_isa_attach(device_t dev)
if (sc->model == PCXI || sc->model == PCXE) {
outb(sc->port, FEPRST | FEPMEM);
- for (i = 0; i < 100; i++) {
+ for (i = 0; i < 10; i++) {
if ((inb(sc->port) & FEPMASK) != FEPRST)
break;
- digi_delay(sc, "digirst2");
+ digi_delay(sc, "digirst2", 1);
}
- if (i == 100) {
+ if (i == 10) {
device_printf(dev, "2nd reset failed (0x%02x)\n",
inb(sc->port));
sc->hidewin(sc);
OpenPOWER on IntegriCloud