diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-08-19 07:40:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-08-19 07:40:15 +0000 |
| commit | 1be3954b06812f26eb31fbd6630cadac035b1486 (patch) | |
| tree | c934dab3058327126ecb9290ea93903d4c8e5fad /sys/dev | |
| parent | 24794ab78fa8ff1579570c582cb6280e08485a72 (diff) | |
pnpdevs.h
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/aha.c | 9 | ||||
| -rw-r--r-- | sys/dev/isa/pnpdevs.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 3764adc9854..e9ee5ffc7e9 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.33 1999/01/07 06:14:46 niklas Exp $ */ +/* $OpenBSD: aha.c,v 1.34 1999/08/19 07:40:14 deraadt Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -375,13 +375,16 @@ ahaattach(parent, self, aux) struct aha_softc *sc = (void *)self; int isapnp = !strcmp(parent->dv_cfdata->cf_driver->cd_name, "isapnp"); - if (isapnp) + if (isapnp) { ia->ia_iobase = ia->ipa_io[0].base; + isadma_cascade(ia->ia_drq); + } + if (aha_find(ia, sc, isapnp) != 0) panic("ahaattach: aha_find of %s failed", self->dv_xname); sc->sc_iobase = ia->ia_iobase; - if (sc->sc_drq != DRQUNK) + if (sc->sc_drq != DRQUNK && isapnp == 0) isadma_cascade(sc->sc_drq); aha_inquire_setup_information(sc); diff --git a/sys/dev/isa/pnpdevs.h b/sys/dev/isa/pnpdevs.h index 623ee4c9d79..8ca2f82ddd7 100644 --- a/sys/dev/isa/pnpdevs.h +++ b/sys/dev/isa/pnpdevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * # OpenBSD: pnpdevs,v 1.93 1999/08/18 07:46:33 deraadt Exp + * # OpenBSD: pnpdevs,v 1.94 1999/08/19 07:40:08 deraadt Exp */ struct isapnp_knowndev isapnp_knowndevs[] = { |