system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-21 01:03:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make delay iteration counts a function of hz as the delay period in each

Browse source 
loop is inversly proportional to hz.

This makes things more sane for configurations with hz != 100.

Cosmetic: Make the loops look similar to the loops in digi.c
This commit is contained in:
Brian Somers 2002-04-17 15:28:41 +00:00
parent b2d8576794
commit c357e4dfc8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=94950
1 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
sys/dev/digi/digi_isa.c
View file

@ -112,14 +112,12 @@ digi_isa_check(struct digi_softc *sc)
/* Invasive probe - reset the card */
outb(sc->port, FEPRST);
for (i = 0; i < 10; i++) {
if ((inb(sc->port) & FEPMASK) == FEPRST)
break;
for (i = 0; (inb(sc->port) & FEPMASK) != FEPRST; i++) {
if (i == hz / 10)
return (NULL);
digi_delay(sc, "digirst", 1);
}
if (i == 10)
return (NULL);
DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d delays\n", i));
DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d iterations\n", i));
ident = inb(sc->port);
@ -375,17 +373,15 @@ digi_isa_attach(device_t dev)
reset |= FEPMEM;
outb(sc->port, reset);
for (i = 0; i < 10; i++) {
if ((inb(sc->port) & FEPMASK) == reset)
break;
for (i = 0; (inb(sc->port) & FEPMASK) != reset; i++) {
if (i == hz / 10) {
device_printf(dev, "1st reset failed\n");
sc->hidewin(sc);
goto failed;
}
digi_delay(sc, "digirst1", 1);
}
if (i == 10) {
device_printf(dev, "1st reset failed\n");
sc->hidewin(sc);
goto failed;
}
DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d delays\n", i));
DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d iterations\n", i));
if (sc->model != PCXI) {
t = (sc->pmem >> 8) & 0xffe0;
@ -397,18 +393,18 @@ digi_isa_attach(device_t dev)
if (sc->model == PCXI || sc->model == PCXE) {
outb(sc->port, FEPRST | FEPMEM);
for (i = 0; i < 10; i++) {
if ((inb(sc->port) & FEPMASK) != FEPRST)
break;
for (i = 0; (inb(sc->port) & FEPMASK) != FEPRST; i++) {
if (i == hz / 10) {
device_printf(dev,
"memory reservation failed (0x%02x)\n",
inb(sc->port));
sc->hidewin(sc);
goto failed;
}
digi_delay(sc, "digirst2", 1);
}
if (i == 10) {
device_printf(dev, "2nd reset failed (0x%02x)\n",
inb(sc->port));
sc->hidewin(sc);
goto failed;
}
DLOG(DIGIDB_INIT, (sc->dev, "got memory after %d delays\n", i));
DLOG(DIGIDB_INIT, (sc->dev, "got memory after %d iterations\n",
i));
}
DLOG(DIGIDB_INIT, (sc->dev, "short memory test\n"));