diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-07-20 16:36:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-07-20 16:36:07 +0000 |
| commit | 85273159e99f5a6dde00812182cd445ede601017 (patch) | |
| tree | bf3f7f4a9468f93b100441e7ae13a636587eed2a /sys/dev/isa/ym_isapnp.c | |
| parent | 2e70dfdc1eef4bf20a1fb8db5e6be5ff902dad72 (diff) | |
first cut at isapnp and ym mpu
Diffstat (limited to 'sys/dev/isa/ym_isapnp.c')
| -rw-r--r-- | sys/dev/isa/ym_isapnp.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sys/dev/isa/ym_isapnp.c b/sys/dev/isa/ym_isapnp.c index f412fb5a8c5..84d3fd4fac3 100644 --- a/sys/dev/isa/ym_isapnp.c +++ b/sys/dev/isa/ym_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ym_isapnp.c,v 1.4 1999/03/08 11:16:49 deraadt Exp $ */ +/* $OpenBSD: ym_isapnp.c,v 1.5 1999/07/20 16:36:06 deraadt Exp $ */ /* @@ -32,6 +32,8 @@ * and Pentium (II) motherboards. */ +#include "midi.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/errno.h> @@ -42,6 +44,7 @@ #include <sys/audioio.h> #include <dev/audio_if.h> +#include <dev/midi_if.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> @@ -51,6 +54,7 @@ #include <dev/ic/cs4231reg.h> #include <dev/isa/cs4231var.h> +#include <dev/isa/mpu401var.h> #include <dev/isa/wssreg.h> #include <dev/isa/ymvar.h> @@ -62,7 +66,6 @@ struct cfattach ym_isapnp_ca = { sizeof(struct ym_softc), ym_isapnp_match, ym_isapnp_attach }; - /* * Probe / attach routines. */ @@ -92,7 +95,7 @@ ym_isapnp_attach(parent, self, aux) struct isa_attach_args *ia = aux; if (ia->ipa_nio < 5) { - printf ("Insufficient I/O ports... not really attached\n"); + printf("Insufficient I/O ports... not really attached\n"); return; } @@ -113,6 +116,10 @@ ym_isapnp_attach(parent, self, aux) sc->sc_ad1848.mode = 2; sc->sc_ad1848.MCE_bit = MODE_CHANGE_ENABLE; +#if NMIDI > 0 + sc->sc_mpu_sc.iobase = ia->ipa_io[3].base; + sc->sc_mpu_sc.ioh = ia->ipa_io[3].h; +#endif + ym_attach(sc); } - |