diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-20 18:40:37 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-20 18:40:37 +0000 |
| commit | e4232757b30346a182214fb65da8a76f2edb7b24 (patch) | |
| tree | 5c1b89b92ef8c67dfa2d0f3a078804042a1555ee /sys/dev/isa/isapnp.c | |
| parent | 0a8f2cc87f99deec610ef91696850a249bd8fb81 (diff) | |
Merge bus_dma support from NetBSD, mostly by Jason Thorpe. Only i386 uses it
so far, the other archs gets placeholders for now. I wrote a compatibility
layer for OpenBSD's old isadma code so we can still use our old
driver sources. They will however get changed to native bus_dma use,
on a case by case basis. Oh yes, I almost forgot, I kept our notion
of isadma being a device so DMA-less ISA-busses still work
Diffstat (limited to 'sys/dev/isa/isapnp.c')
| -rw-r--r-- | sys/dev/isa/isapnp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c index 790bffde6cf..368d5669472 100644 --- a/sys/dev/isa/isapnp.c +++ b/sys/dev/isa/isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isapnp.c,v 1.16 1997/12/30 07:00:39 deraadt Exp $ */ +/* $OpenBSD: isapnp.c,v 1.17 1998/01/20 18:40:31 niklas Exp $ */ /* $NetBSD: isapnp.c,v 1.9.4.3 1997/10/29 00:40:43 thorpej Exp $ */ /* @@ -838,6 +838,7 @@ isapnp_attach(parent, self, aux) sc->sc_iot = ia->ia_iot; sc->sc_memt = ia->ia_memt; + sc->sc_dmat = ia->ia_dmat; sc->sc_ncards = 0; if (isapnp_map(sc)) @@ -888,6 +889,7 @@ isapnp_attach(parent, self, aux) lpa->ia_ic = ia->ia_ic; lpa->ia_iot = ia->ia_iot; lpa->ia_memt = ia->ia_memt; + lpa->ia_dmat = ia->ia_dmat; lpa->ia_delaybah = ia->ia_delaybah; isapnp_write_reg(sc, ISAPNP_ACTIVATE, 1); |