diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/isa/sb_isapnp.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/sys/dev/isa/sb_isapnp.c b/sys/dev/isa/sb_isapnp.c index 04e704dd775..774052dd5f7 100644 --- a/sys/dev/isa/sb_isapnp.c +++ b/sys/dev/isa/sb_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sb_isapnp.c,v 1.4 1998/04/28 00:03:25 deraadt Exp $ */ +/* $OpenBSD: sb_isapnp.c,v 1.5 1998/05/13 20:07:47 deraadt Exp $ */ /* $NetBSD: sb_isa.c,v 1.3 1997/03/20 11:03:11 mycroft Exp $ */ /* @@ -91,26 +91,27 @@ sb_isapnp_attach(parent, self, aux) sc->sc_iot = ia->ia_iot; sc->sc_ioh = ia->ipa_io[0].h; + sc->sc_ic = ia->ia_ic; + sc->sc_iobase = ia->ipa_io[0].base; sc->sc_irq = ia->ipa_irq[0].num; - sc->sc_ic = ia->ia_ic; sc->sc_drq8 = ia->ipa_drq[0].num; - if (ia->ipa_ndrq > 1 && ia->ipa_drq[0].num != ia->ipa_drq[1].num) { - /* Some cards have the 16 bit drq first */ - if (sc->sc_drq8 >= 4) { - sc->sc_drq16 = sc->sc_drq8; - sc->sc_drq8 = ia->ipa_drq[1].num; - } else - sc->sc_drq16 = ia->ipa_drq[1].num; - } else - sc->sc_drq16 = DRQUNK; - - /* - * isapnp is a child if isa, and we needs isa for the dma - * routines - */ - sc->sc_isa = parent->dv_parent; + if (ia->ipa_ndrq > 1 && ia->ipa_drq[0].num != ia->ipa_drq[1].num) { + /* Some cards have the 16 bit drq first */ + if (sc->sc_drq8 >= 4) { + sc->sc_drq16 = sc->sc_drq8; + sc->sc_drq8 = ia->ipa_drq[1].num; + } else + sc->sc_drq16 = ia->ipa_drq[1].num; + } else + sc->sc_drq16 = DRQUNK; + + /* + * isapnp is a child if isa, and we needs isa for the dma + * routines + */ + sc->sc_isa = parent->dv_parent; if (!sbmatch(sc)) return; |