d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the PCI port for pci cards, not just for PCIXR cards.

Browse Source 
Add the card name to the error message for the first initialisation
failure, giving us more info about what was actually discovered.

This code has been tested by Robert Suetterlin <robert@mpe.mpg.de>
to work on a PCI Xem card.
This commit is contained in:
Brian Somers 2002-04-10 01:15:23 +00:00
parent f1e4a6e941
commit b50da81d3a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/digi/digi.c
View File

@ -298,16 +298,16 @@ digi_init(struct digi_softc *sc)
case PCXEM:
case PCIEPCX:
case PCIXR:
if (sc->model == PCIXR)
if (sc->pcibus)
PCIPORT = FEPRST;
else
outb(sc->port, FEPRST | FEPMEM);
for (i = 0; ((sc->model == PCIXR ? PCIPORT : inb(sc->port)) &
for (i = 0; ((sc->pcibus ? PCIPORT : inb(sc->port)) &
FEPMASK) != FEPRST; i++) {
if (i > 1000) {
log(LOG_ERR, "digi%d: init reset failed\n",
sc->res.unit);
log(LOG_ERR, "digi%d: %s init reset failed\n",
sc->res.unit, sc->name);
return (EIO);
}
tsleep(sc, PUSER | PCATCH, "digiinit0", 1);
@ -348,7 +348,7 @@ digi_init(struct digi_softc *sc)
ptr = sc->setwin(sc, MISCGLOBAL);
W(ptr) = 0;
if (sc->model == PCIXR) {
if (sc->pcibus) {
PCIPORT = FEPCLR;
resp = FEPRST;
} else if (sc->model == PCXEVE) {
@ -359,7 +359,7 @@ digi_init(struct digi_softc *sc)
resp = FEPRST | FEPMEM;
}
for (i = 0; ((sc->model == PCIXR ? PCIPORT : inb(sc->port)) & FEPMASK)
for (i = 0; ((sc->pcibus ? PCIPORT : inb(sc->port)) & FEPMASK)
== resp; i++) {
if (i > 1000) {
log(LOG_ERR, "digi%d: BIOS start failed\n",