diff options
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/mpu401.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/mpu401var.h | 59 | ||||
| -rw-r--r-- | sys/dev/isa/mpu_isapnp.c | 2 | ||||
| -rw-r--r-- | sys/dev/isa/sbdspvar.h | 4 | ||||
| -rw-r--r-- | sys/dev/isa/ym.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/ym_isapnp.c | 4 |
6 files changed, 9 insertions, 68 deletions
diff --git a/sys/dev/isa/mpu401.c b/sys/dev/isa/mpu401.c index 225a7a113a5..ac09dc28aad 100644 --- a/sys/dev/isa/mpu401.c +++ b/sys/dev/isa/mpu401.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpu401.c,v 1.3 1999/07/23 13:18:04 niklas Exp $ */ +/* $OpenBSD: mpu401.c,v 1.4 1999/08/05 05:32:40 deraadt Exp $ */ /* $NetBSD: mpu401.c,v 1.3 1998/11/25 22:17:06 augustss Exp $ */ /* @@ -56,7 +56,7 @@ #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> -#include <dev/isa/mpu401var.h> +#include <dev/ic/mpuvar.h> #ifndef splaudio #define splaudio() splbio() /* XXX found in audio_if.h normally */ diff --git a/sys/dev/isa/mpu401var.h b/sys/dev/isa/mpu401var.h deleted file mode 100644 index 97ea3041168..00000000000 --- a/sys/dev/isa/mpu401var.h +++ /dev/null @@ -1,59 +0,0 @@ -/* $OpenBSD: mpu401var.h,v 1.2 1999/07/20 16:36:05 deraadt Exp $ */ -/* $NetBSD: mpu401var.h,v 1.3 1998/11/25 22:17:06 augustss Exp $ */ - -/* - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Lennart Augustsson (augustss@netbsd.org). - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -struct mpu_softc { - bus_space_tag_t iot; /* tag */ - bus_space_handle_t ioh; /* handle */ - int iobase; - int open; - void (*intr)__P((void*, int)); /* midi input intr handler */ - void *arg; /* arg for intr() */ -}; - -struct midi_hw_if mpu_midi_hw_if; - -int mpu_intr __P((void *)); -int mpu_find __P((void *)); -int mpu_open __P((void *, int, - void (*iintr)__P((void *, int)), - void (*ointr)__P((void *)), void *arg)); -void mpu_close __P((void *)); -int mpu_output __P((void *, int)); -void mpu_getinfo __P((void *addr, struct midi_info *mi)); - diff --git a/sys/dev/isa/mpu_isapnp.c b/sys/dev/isa/mpu_isapnp.c index 7814e27195b..93f258a2ee0 100644 --- a/sys/dev/isa/mpu_isapnp.c +++ b/sys/dev/isa/mpu_isapnp.c @@ -18,7 +18,7 @@ #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> -#include <dev/isa/mpu401var.h> +#include <dev/ic/mpuvar.h> int mpu_isapnp_match __P((struct device *, void *, void *)); void mpu_isapnp_attach __P((struct device *, struct device *, void *)); diff --git a/sys/dev/isa/sbdspvar.h b/sys/dev/isa/sbdspvar.h index bad0ef19d60..d5cf4dcb1fb 100644 --- a/sys/dev/isa/sbdspvar.h +++ b/sys/dev/isa/sbdspvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbdspvar.h,v 1.10 1999/07/20 16:36:05 deraadt Exp $ */ +/* $OpenBSD: sbdspvar.h,v 1.11 1999/08/05 05:32:41 deraadt Exp $ */ /* $NetBSD: sbdspvar.h,v 1.37 1998/08/10 00:20:39 mycroft Exp $ */ /* @@ -37,7 +37,7 @@ #include "midi.h" #if NMIDI > 0 -#include <dev/isa/mpu401var.h> +#include <dev/ic/mpuvar.h> #endif #define SB_MASTER_VOL 0 diff --git a/sys/dev/isa/ym.c b/sys/dev/isa/ym.c index ea4b11a68f9..3e39bba2911 100644 --- a/sys/dev/isa/ym.c +++ b/sys/dev/isa/ym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ym.c,v 1.7 1999/07/21 16:19:55 provos Exp $ */ +/* $OpenBSD: ym.c,v 1.8 1999/08/05 05:32:41 deraadt Exp $ */ /* @@ -52,7 +52,7 @@ #include <dev/ic/ad1848reg.h> #include <dev/isa/ad1848var.h> #include <dev/ic/opl3sa3.h> -#include <dev/isa/mpu401var.h> +#include <dev/ic/mpuvar.h> #include <dev/isa/ymvar.h> int ym_getdev __P((void *, struct audio_device *)); diff --git a/sys/dev/isa/ym_isapnp.c b/sys/dev/isa/ym_isapnp.c index d5cb93bd9f9..90d49707ac3 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.6 1999/07/21 12:39:22 deraadt Exp $ */ +/* $OpenBSD: ym_isapnp.c,v 1.7 1999/08/05 05:32:41 deraadt Exp $ */ /* @@ -54,7 +54,7 @@ #include <dev/ic/cs4231reg.h> #include <dev/isa/cs4231var.h> -#include <dev/isa/mpu401var.h> +#include <dev/ic/mpuvar.h> #include <dev/isa/wssreg.h> #include <dev/isa/ymvar.h> |