remove the ``midisyn'' framework and anything using it, i.e., the opl

device and the midi interface to pcppi.

5 files changed, 1 insertions, 455 deletions

diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 32337307b03..2ac2806f6c3 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.106 2010/03/28 17:04:29 deraadt Exp $
+#	$OpenBSD: files.isa,v 1.107 2010/07/31 08:33:20 ratchov Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config file and device description for machine-independent ISA code.
@@ -230,9 +230,6 @@ file	dev/isa/sb.c			sb needs-flag
 attach	sb at isa with sb_isa
 file	dev/isa/sb_isa.c		sb & (sb_isa | sb_isapnp) needs-flag
 
-attach	opl at sbdsp with opl_sb
-file	dev/isa/opl_sb.c		opl_sb
-
 # Soundcards based on Sierra's Aria chipset.
 # Such as the Prometheus Aria 16 or the Diamond
 # sonic sound.
@@ -274,9 +271,6 @@ file	dev/isa/wss_isa.c		wss & (wss_isa | wss_isapnp) needs-flag
 device	ess {} : audio, isa_dma, mulaw, auconv, midibus
 file	dev/isa/ess.c			ess needs-flag
 
-attach	opl at ess with opl_ess
-file	dev/isa/opl_ess.c		opl_ess
-
 # Gravis UltraSound & UltraSound MAX.
 # Use the "flags" keyword in a config file to specify an extra DMA
 # channel for full-duplex operation.
@@ -287,10 +281,6 @@ file	dev/isa/gus.c			gus needs-flag
 attach	gus at isa with gus_isa
 file	dev/isa/gus_isa.c		gus & (gus_isa | gus_isapnp) needs-flag
 
-# Yamaha OPL2/OPL3 FM synth
-attach	opl at isa with opl_isa
-file	dev/isa/opl_isa.c		opl_isa
-
 # Sound Forte RadioLink SF16-FMR FM Radio Card
 device sfr: radiobus, tc921x, pt2254a
 attach sfr at isa
@@ -325,8 +315,6 @@ file	dev/isa/pcppi.c	pcppi	needs-flag
 device	spkr
 attach	spkr at pcppi
 file	dev/isa/spkr.c			spkr	needs-flag
-attach	midi at pcppi with midi_pcppi: midisyn
-file	dev/isa/midi_pcppi.c		midi_pcppi
 
 # 8255A-based PC parallel ports
 attach	lpt at isa with lpt_isa
diff --git a/sys/dev/isa/midi_pcppi.c b/sys/dev/isa/midi_pcppi.c
deleted file mode 100644
index f2e5573ae8b..00000000000
--- a/sys/dev/isa/midi_pcppi.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*	$OpenBSD: midi_pcppi.c,v 1.6 2008/06/26 05:42:16 ray Exp $	*/
-/*	$NetBSD: midi_pcppi.c,v 1.4 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.
- *
- * 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.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/conf.h>
-#include <sys/selinfo.h>
-#include <sys/audioio.h>
-#include <sys/midiio.h>
-
-#include <dev/isa/pcppivar.h>
-
-#include <dev/audio_if.h>
-#include <dev/midi_if.h>
-#include <dev/midivar.h>
-#include <dev/midisynvar.h>
-
-#define MAX_DURATION 30		/* turn off sound automagically after 30 s */
-
-struct midi_pcppi_softc {
-	struct midi_softc sc_mididev;
-	midisyn sc_midisyn;
-};
-
-int	midi_pcppi_match(struct device *, void *, void *);
-void	midi_pcppi_attach(struct device *, struct device *, void *);
-
-void	midi_pcppi_on(midisyn *, u_int32_t, u_int32_t, u_int32_t);
-void	midi_pcppi_off(midisyn *, u_int32_t, u_int32_t, u_int32_t);
-void	midi_pcppi_close(midisyn *);
-
-struct cfattach midi_pcppi_ca = {
-	sizeof(struct midi_pcppi_softc), midi_pcppi_match, midi_pcppi_attach
-};
-
-struct midisyn_methods midi_pcppi_hw = {
-	0,			/* open */
-	midi_pcppi_close,
-	0,			/* ioctl */
-	0,			/* allocv */
-	midi_pcppi_on,
-	midi_pcppi_off,
-	0,
-	0,
-	0,
-	0,
-	0,
-	0,
-};
-
-int midi_pcppi_attached = 0;	/* Not very nice */
-
-int
-midi_pcppi_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
-{
-	return (!midi_pcppi_attached);
-}
-
-void
-midi_pcppi_attach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
-{
-	struct midi_pcppi_softc *sc = (struct midi_pcppi_softc *)self;
-	struct pcppi_attach_args *pa = (struct pcppi_attach_args *)aux;
-	midisyn *ms;
-
-	ms = &sc->sc_midisyn;
-	ms->mets = &midi_pcppi_hw;
-	strlcpy(ms->name, "PC speaker", sizeof ms->name);
-	ms->nvoice = 1;
-	ms->flags = MS_DOALLOC | MS_FREQXLATE;
-	ms->data = pa->pa_cookie;
-
-	midi_pcppi_attached++;
-
-	midisyn_attach(&sc->sc_mididev, ms);
-	midi_attach(&sc->sc_mididev, parent);
-}
-
-void
-midi_pcppi_on(ms, chan, note, vel)
-	midisyn *ms;
-	u_int32_t chan, note, vel;
-{
-	pcppi_tag_t t = ms->data;
-
-	/*printf("ON  %p %d\n", t, MIDISYN_FREQ_TO_HZ(note));*/
-	pcppi_bell(t, MIDISYN_FREQ_TO_HZ(note), MAX_DURATION * hz, 0);
-}
-
-void
-midi_pcppi_off(ms, chan, note, vel)
-	midisyn *ms;
-	u_int32_t chan, note, vel;
-{
-	pcppi_tag_t t = ms->data;
-
-	/*printf("OFF %p %d\n", t, note >> 16);*/
-	pcppi_bell(t, 0, 0, 0);
-}
-
-void
-midi_pcppi_close(ms)
-	midisyn *ms;
-{
-	pcppi_tag_t t = ms->data;
-
-	/* Make sure we are quiet. */
-	pcppi_bell(t, 0, 0, 0);
-}
diff --git a/sys/dev/isa/opl_ess.c b/sys/dev/isa/opl_ess.c
deleted file mode 100644
index ecb20988828..00000000000
--- a/sys/dev/isa/opl_ess.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$OpenBSD: opl_ess.c,v 1.6 2008/06/26 05:42:16 ray Exp $	*/
-/*	$NetBSD: opl_ess.c,v 1.3 1998/12/08 14:26:57 augustss Exp $	*/
-
-/*
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Author: Lennart Augustsson
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/conf.h>
-#include <sys/selinfo.h>
-#include <sys/audioio.h>
-#include <sys/midiio.h>
-
-#include <machine/bus.h>
-
-#include <dev/audio_if.h>
-#include <dev/midi_if.h>
-#include <dev/ic/oplreg.h>
-#include <dev/ic/oplvar.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/essvar.h>
-
-extern int	ess_speaker_ctl(void *, int);
-
-int	opl_ess_match(struct device *, void *, void *);
-void	opl_ess_attach(struct device *, struct device *, void *);
-
-struct cfattach opl_ess_ca = {
-	sizeof (struct opl_softc), opl_ess_match, opl_ess_attach
-};
-
-int
-opl_ess_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
-{
-	struct audio_attach_args *aa = (struct audio_attach_args *)aux;
-	struct ess_softc *ssc = (struct ess_softc *)parent;
-	struct opl_attach_arg oaa;
-
-	if (aa->type != AUDIODEV_TYPE_OPL)
-		return (0);
-	memset(&oaa, 0, sizeof oaa);
-	oaa.ioh = ssc->sc_ioh;
-	oaa.iot = ssc->sc_iot;
-	return (opl_find(&oaa));
-}
-
-void
-opl_ess_attach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
-{
-	struct ess_softc *ssc = (struct ess_softc *)parent;
-	struct opl_softc *sc = (struct opl_softc *)self;
-
-	sc->ioh = ssc->sc_ioh;
-	sc->iot = ssc->sc_iot;
-	sc->offs = 0;
-	sc->spkrctl = ess_speaker_ctl;
-	sc->spkrarg = ssc;
-	strlcpy(sc->syn.name, "ESS ", sizeof sc->syn.name);
-
-	opl_attach(sc);
-}
diff --git a/sys/dev/isa/opl_isa.c b/sys/dev/isa/opl_isa.c
deleted file mode 100644
index d40ed5449cc..00000000000
--- a/sys/dev/isa/opl_isa.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$OpenBSD: opl_isa.c,v 1.5 2008/06/26 05:42:16 ray Exp $	*/
-/*	$NetBSD: opl_isa.c,v 1.1 1998/08/26 13:33:59 augustss Exp $	*/
-
-/*
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Author: Lennart Augustsson
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/conf.h>
-#include <sys/selinfo.h>
-#include <sys/audioio.h>
-#include <sys/midiio.h>
-
-#include <machine/bus.h>
-
-#include <dev/audio_if.h>
-#include <dev/midi_if.h>
-
-#include <dev/ic/oplreg.h>
-#include <dev/ic/oplvar.h>
-
-#include <dev/isa/isavar.h>
-
-#define OPL_SIZE 4
-
-int	opl_isa_match(struct device *, void *, void *);
-void	opl_isa_attach(struct device *, struct device *, void *);
-
-struct cfattach opl_isa_ca = {
-	sizeof (struct opl_softc), opl_isa_match, opl_isa_attach
-};
-
-int
-opl_isa_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
-{
-	struct isa_attach_args *ia = aux;
-	struct opl_softc sc;
-	int r;
-
-	memset(&sc, 0, sizeof sc);
-	sc.iot = ia->ia_iot;
-	if (bus_space_map(sc.iot, ia->ia_iobase, OPL_SIZE, 0, &sc.ioh))
-		return (0);
-	r = opl_find(&sc);
-        bus_space_unmap(sc.iot, sc.ioh, OPL_SIZE);
-	return (r);
-}
-
-void
-opl_isa_attach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
-{
-	struct opl_softc *sc = (struct opl_softc *)self;
-	struct isa_attach_args *ia = aux;
-
-	if (bus_space_map(sc->iot, ia->ia_iobase, OPL_SIZE, 0, &sc->ioh)) {
-		printf("opl_isa_attach: bus_space_map failed\n");
-		return;
-	}
-	sc->offs = 0;
-
-	opl_attach(sc);
-}
diff --git a/sys/dev/isa/opl_sb.c b/sys/dev/isa/opl_sb.c
deleted file mode 100644
index 0872caebe5b..00000000000
--- a/sys/dev/isa/opl_sb.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$OpenBSD: opl_sb.c,v 1.7 2008/06/26 05:42:16 ray Exp $	*/
-/*	$NetBSD: opl_sb.c,v 1.4 1998/12/08 14:26:57 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.
- *
- * 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.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/conf.h>
-#include <sys/selinfo.h>
-#include <sys/audioio.h>
-#include <sys/midiio.h>
-
-#include <machine/bus.h>
-
-#include <dev/audio_if.h>
-#include <dev/midi_if.h>
-#include <dev/ic/oplreg.h>
-#include <dev/ic/oplvar.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/sbdspvar.h>
-
-int	opl_sb_match(struct device *, void *, void *);
-void	opl_sb_attach(struct device *, struct device *, void *);
-
-struct cfattach opl_sb_ca = {
-	sizeof (struct opl_softc), opl_sb_match, opl_sb_attach
-};
-
-int
-opl_sb_match(parent, match, aux)
-	struct device *parent;
-	void *match;
-	void *aux;
-{
-	struct audio_attach_args *aa = (struct audio_attach_args *)aux;
-	struct sbdsp_softc *ssc = (struct sbdsp_softc *)parent;
-	struct opl_attach_arg oaa;
-
-	if (aa->type != AUDIODEV_TYPE_OPL)
-		return (0);
-	memset(&oaa, 0, sizeof oaa);
-	oaa.ioh = ssc->sc_ioh;
-	oaa.iot = ssc->sc_iot;
-	return (opl_find(&oaa));
-}
-
-void
-opl_sb_attach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
-{
-	struct  sbdsp_softc *ssc = (struct sbdsp_softc *)parent;
-	struct opl_softc *sc = (struct opl_softc *)self;
-
-	sc->ioh = ssc->sc_ioh;
-	sc->iot = ssc->sc_iot;
-	sc->offs = 0;
-	sc->spkrctl = sbdsp_speaker_ctl;
-	sc->spkrarg = ssc;
-	strlcpy(sc->syn.name, "SB ", sizeof sc->syn.name);
-
-	opl_attach(sc);
-}