diff options
| author | Niels Provos <provos@cvs.openbsd.org> | 1998-04-26 21:03:19 +0000 |
|---|---|---|
| committer | Niels Provos <provos@cvs.openbsd.org> | 1998-04-26 21:03:19 +0000 |
| commit | 74d8ccd39b9fa27c65fe29abc88e61deea50b102 (patch) | |
| tree | ad8b9504a859efe3f96a8cc68f4c3e76f16886a0 /sys/dev/isa/isa.c | |
| parent | db97ee572f05c64c35bd40855c1b415a3b4f08ab (diff) | |
update audio from NetBSD, mostly by Lennart Augustsson <augustss@cs.chalmers.se>
Diffstat (limited to 'sys/dev/isa/isa.c')
| -rw-r--r-- | sys/dev/isa/isa.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c index 3010e861fdd..39366021b0e 100644 --- a/sys/dev/isa/isa.c +++ b/sys/dev/isa/isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa.c,v 1.31 1998/01/20 21:42:25 niklas Exp $ */ +/* $OpenBSD: isa.c,v 1.32 1998/04/26 21:02:47 provos Exp $ */ /* $NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $ */ /* @@ -173,6 +173,8 @@ isaprint(aux, isa) printf(" irq %d", ia->ia_irq); if (ia->ia_drq != DRQUNK) printf(" drq %d", ia->ia_drq); + if (ia->ia_drq2 != DRQUNK) + printf(" drq2 %d", ia->ia_drq2); return (UNCONF); } @@ -192,12 +194,13 @@ isascan(parent, match) ia.ia_dmat = sc->sc_dmat; #endif /* NISADMA > 0 */ ia.ia_ic = sc->sc_ic; - ia.ia_iobase = cf->cf_loc[0]; + ia.ia_iobase = cf->cf_iobase; ia.ia_iosize = 0x666; - ia.ia_maddr = cf->cf_loc[2]; - ia.ia_msize = cf->cf_loc[3]; - ia.ia_irq = cf->cf_loc[4] == 2 ? 9 : cf->cf_loc[4]; - ia.ia_drq = cf->cf_loc[5]; + ia.ia_maddr = cf->cf_maddr; + ia.ia_msize = cf->cf_msize; + ia.ia_irq = cf->cf_irq == 2 ? 9 : cf->cf_irq; + ia.ia_drq = cf->cf_drq; + ia.ia_drq2 = cf->cf_drq2; ia.ia_delaybah = sc->sc_delaybah; if (cf->cf_fstate == FSTATE_STAR) { @@ -223,6 +226,8 @@ isascan(parent, match) #if NISADMA > 0 if (ia.ia_drq != DRQUNK) ISA_DRQ_ALLOC((struct device *)sc, ia.ia_drq); + if (ia.ia_drq2 != DRQUNK) + ISA_DRQ_ALLOC((struct device *)sc, ia.ia_drq2); #endif /* NISAMDA > 0 */ } if (autoconf_verbose) @@ -244,6 +249,8 @@ isascan(parent, match) #if NISADMA > 0 if (ia.ia_drq != DRQUNK) ISA_DRQ_ALLOC((struct device *)sc, ia.ia_drq); + if (ia.ia_drq2 != DRQUNK) + ISA_DRQ_ALLOC((struct device *)sc, ia.ia_drq2); #endif /* NISAMDA > 0 */ } else { if (autoconf_verbose) |