diff options
author | brian <brian@FreeBSD.org> | 2002-04-10 12:03:36 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 2002-04-10 12:03:36 +0000 |
commit | ee1c37fb3536a345b7a0453ff23f2a502156e220 (patch) | |
tree | dc882a800fcc5cef86e5213992ca98131458e06f /sys/dev/digi/digi.c | |
parent | 4100d7ad0fd1685daadebee6380b55dc43d1a944 (diff) | |
download | FreeBSD-src-ee1c37fb3536a345b7a0453ff23f2a502156e220.zip FreeBSD-src-ee1c37fb3536a345b7a0453ff23f2a502156e220.tar.gz |
Change more uses of tsleep() to digi_delay() and make the loop counts more
sane.
Diffstat (limited to 'sys/dev/digi/digi.c')
-rw-r--r-- | sys/dev/digi/digi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c index f7e7334..4111e15 100644 --- a/sys/dev/digi/digi.c +++ b/sys/dev/digi/digi.c @@ -221,11 +221,11 @@ digi_bcopy(const void *vfrom, void *vto, size_t sz) return (1); } -static void +void digi_delay(struct digi_softc *sc, const char *txt) { if (cold) - DELAY(5000); + DELAY(1000); else tsleep(sc, PUSER | PCATCH, txt, 5); } @@ -314,7 +314,7 @@ digi_init(struct digi_softc *sc) for (i = 0; ((sc->pcibus ? PCIPORT : inb(sc->port)) & FEPMASK) != FEPRST; i++) { - if (i > 1000) { + if (i > 100) { log(LOG_ERR, "digi%d: %s init reset failed\n", sc->res.unit, sc->name); return (EIO); @@ -370,7 +370,7 @@ digi_init(struct digi_softc *sc) for (i = 0; ((sc->pcibus ? PCIPORT : inb(sc->port)) & FEPMASK) == resp; i++) { - if (i > 1000) { + if (i > 100) { log(LOG_ERR, "digi%d: BIOS start failed\n", sc->res.unit); return (EIO); @@ -381,7 +381,7 @@ digi_init(struct digi_softc *sc) DLOG(DIGIDB_INIT, (sc->dev, "BIOS started after %d us\n", i)); for (i = 0; vW(ptr) != *(u_short *)"GD"; i++) { - if (i > 2000) { + if (i > 200) { log(LOG_ERR, "digi%d: BIOS boot failed " "(0x%02x != 0x%02x)\n", sc->res.unit, vW(ptr), *(u_short *)"GD"); @@ -421,7 +421,7 @@ digi_init(struct digi_softc *sc) outb(sc->port, FEPCLR | FEPMEM); for (i = 0; W(ptr); i++) { - if (i > 10) { + if (i > 100) { log(LOG_ERR, "digi%d: FEP/OS move failed\n", sc->res.unit); sc->hidewin(sc); @@ -506,7 +506,7 @@ digi_init(struct digi_softc *sc) /* Now wait 'till the FEP/OS has booted */ for (i = 0; vW(ptr) != *(u_short *)"OS"; i++) { - if (i > 2000) { + if (i > 200) { log(LOG_ERR, "digi%d: FEP/OS start failed " "(0x%02x != 0x%02x)\n", sc->res.unit, vW(ptr), *(u_short *)"OS"); |