diff options
Diffstat (limited to 'sys/dev/pci')
-rw-r--r-- | sys/dev/pci/files.pci | 11 | ||||
-rw-r--r-- | sys/dev/pci/opl_cmpci.c | 95 | ||||
-rw-r--r-- | sys/dev/pci/opl_eso.c | 102 | ||||
-rw-r--r-- | sys/dev/pci/opl_yds.c | 102 |
4 files changed, 1 insertions, 309 deletions
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index a713c49394d..702f7950f8e 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $OpenBSD: files.pci,v 1.273 2010/07/03 01:02:25 mlarkin Exp $ +# $OpenBSD: files.pci,v 1.274 2010/07/31 08:33:20 ratchov Exp $ # $NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $ # # Config file and device description for machine-independent PCI code. @@ -116,9 +116,6 @@ device eso {}: audio, auconv, mulaw, midibus attach eso at pci file dev/pci/eso.c eso -attach opl at eso with opl_eso -file dev/pci/opl_eso.c opl_eso - # Acer Labs M5455 device auacer: audio, auconv, mulaw, ac97 attach auacer at pci @@ -180,9 +177,6 @@ device yds {}: audio, auconv, mulaw, ac97, firmload attach yds at pci file dev/pci/yds.c yds -attach opl at yds with opl_yds -file dev/pci/opl_yds.c opl_yds - # Forte Media FM801 device fms: audio, auconv, mulaw, ac97, midibus, tea5757, radiobus attach fms at pci @@ -571,9 +565,6 @@ device cmpci {}: audio, auconv, mulaw attach cmpci at pci file dev/pci/cmpci.c cmpci -attach opl at cmpci with opl_cmpci -file dev/pci/opl_cmpci.c opl_cmpci - # Initio ULTRA WIDE/ULTRA2 WIDE SCSI Controllers attach iha at pci with iha_pci file dev/pci/iha_pci.c iha_pci diff --git a/sys/dev/pci/opl_cmpci.c b/sys/dev/pci/opl_cmpci.c deleted file mode 100644 index f089786b400..00000000000 --- a/sys/dev/pci/opl_cmpci.c +++ /dev/null @@ -1,95 +0,0 @@ -/* $OpenBSD: opl_cmpci.c,v 1.5 2010/04/08 00:23:53 tedu 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/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/pci/pcireg.h> -#include <dev/pci/pcivar.h> - -#include <dev/pci/cmpcireg.h> -#include <dev/pci/cmpcivar.h> - -int opl_cmpci_match(struct device *, void *, void *); -void opl_cmpci_attach(struct device *, struct device *, void *); - -struct cfdriver opl_cmpci_cd = { - NULL, "opl_cmpci", DV_DULL -}; - -struct cfattach opl_cmpci_ca = { - sizeof (struct opl_softc), opl_cmpci_match, opl_cmpci_attach -}; - -int -opl_cmpci_match(struct device *parent, void *match, void *aux) -{ - struct audio_attach_args *aa = (struct audio_attach_args *)aux; - struct cmpci_softc *ssc = (struct cmpci_softc *)parent; - struct opl_attach_arg oaa; - - if (aa->type != AUDIODEV_TYPE_OPL) - return (0); - memset(&oaa, 0, sizeof oaa); - oaa.iot = ssc->sc_iot; - oaa.ioh = ssc->sc_ioh; - oaa.offs = CMPCI_REG_FM_BASE; - return (opl_find(&oaa)); -} - -void -opl_cmpci_attach(struct device *parent, struct device *self, void *aux) -{ - struct cmpci_softc *ssc = (struct cmpci_softc *)parent; - struct opl_softc *sc = (struct opl_softc *)self; - - sc->ioh = ssc->sc_ioh; - sc->iot = ssc->sc_iot; - sc->offs = CMPCI_REG_FM_BASE; - strlcpy(sc->syn.name, "CMPCI ", sizeof sc->syn.name); - - opl_attach(sc); -} diff --git a/sys/dev/pci/opl_eso.c b/sys/dev/pci/opl_eso.c deleted file mode 100644 index 10f88ab88ed..00000000000 --- a/sys/dev/pci/opl_eso.c +++ /dev/null @@ -1,102 +0,0 @@ -/* $OpenBSD: opl_eso.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */ -/* $NetBSD: opl_eso.c,v 1.1 1999/07/12 15:13:31 kleink 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. - */ - -#ifdef __OpenBSD__ -#define HIDE -#define MATCH_ARG_2_T void * -#else -#define HIDE static -#define MATCH_ARG_2_T struct cfdata * -#endif - -#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/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/pci/pcireg.h> -#include <dev/pci/pcivar.h> - -#include <dev/ic/mpuvar.h> -#include <dev/pci/esovar.h> - -HIDE int opl_eso_match(struct device *, MATCH_ARG_2_T, void *); -HIDE void opl_eso_attach(struct device *, struct device *, void *); - -struct cfattach opl_eso_ca = { - sizeof (struct opl_softc), opl_eso_match, opl_eso_attach -}; - -HIDE int -opl_eso_match(parent, match, aux) - struct device *parent; - MATCH_ARG_2_T match; - void *aux; -{ - struct audio_attach_args *aa = (struct audio_attach_args *)aux; - - if (aa->type != AUDIODEV_TYPE_OPL) - return (0); - return (1); -} - -HIDE void -opl_eso_attach(parent, self, aux) - struct device *parent; - struct device *self; - void *aux; -{ - struct eso_softc *esc = (struct eso_softc *)parent; - struct opl_softc *sc = (struct opl_softc *)self; - - sc->ioh = esc->sc_sb_ioh; - sc->iot = esc->sc_sb_iot; - sc->offs = 0; - strlcpy(sc->syn.name, "ESO ", sizeof sc->syn.name); - /*sc->spkrctl = 0; - sc->spkrarg = 0;*/ - - opl_attach(sc); -} diff --git a/sys/dev/pci/opl_yds.c b/sys/dev/pci/opl_yds.c deleted file mode 100644 index 926533456d1..00000000000 --- a/sys/dev/pci/opl_yds.c +++ /dev/null @@ -1,102 +0,0 @@ -/* $OpenBSD: opl_yds.c,v 1.8 2010/04/08 00:23:53 tedu Exp $ */ -/* $NetBSD$ */ - -/* - * 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/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/ic/ac97.h> - -#include <dev/pci/pcireg.h> -#include <dev/pci/pcivar.h> - -#include <dev/pci/ydsreg.h> -#include <dev/pci/ydsvar.h> - -int opl_yds_match(struct device *, void *, void *); -void opl_yds_attach(struct device *, struct device *, void *); - -struct cfdriver opl_yds_cd = { - NULL, "opl_yds", DV_DULL -}; - -struct cfattach opl_yds_ca = { - sizeof (struct opl_softc), opl_yds_match, opl_yds_attach -}; - -int -opl_yds_match(parent, match, aux) - struct device *parent; - void *match; - void *aux; -{ - struct audio_attach_args *aa = (struct audio_attach_args *)aux; - struct yds_softc *ssc = (struct yds_softc *)parent; - struct opl_attach_arg oaa; - - if (aa->type != AUDIODEV_TYPE_OPL) - return (0); - memset(&oaa, 0, sizeof oaa); - oaa.iot = ssc->sc_opl_iot; - oaa.ioh = ssc->sc_opl_ioh; - return (opl_find(&oaa)); -} - -void -opl_yds_attach(parent, self, aux) - struct device *parent; - struct device *self; - void *aux; -{ - struct yds_softc *ssc = (struct yds_softc *)parent; - struct opl_softc *sc = (struct opl_softc *)self; - - sc->ioh = ssc->sc_opl_ioh; - sc->iot = ssc->sc_opl_iot; - sc->offs = 0; - strlcpy(sc->syn.name, "DS-1 integrated ", sizeof sc->syn.name); - - opl_attach(sc); -} |