SB ISA PnP support goop.

4 files changed, 129 insertions, 5 deletions

diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index e4c204e5671..e809563c446 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.36 1997/12/21 14:41:22 downsj Exp $
+#	$OpenBSD: files.isa,v 1.37 1997/12/25 14:14:54 downsj Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config.new file and device description for machine-independent ISA code.
@@ -220,7 +220,7 @@ device	sb: audio, isa_dma, sbdsp, mulaw, opti
 file	dev/isa/sb.c			sb needs-flag
 
 attach	sb at isa with sb_isa
-file	dev/isa/sb_isa.c		sb_isa needs-flag
+file	dev/isa/sb_isa.c		sb & (sb_isa | sb_isapnp) needs-flag
 
 # Soundcards based on Sierra's Aria chipset.
 # Such as the Prometheus Aria 16 or the Diamond
diff --git a/sys/dev/isa/files.isapnp b/sys/dev/isa/files.isapnp
index 73d384f1ddb..a9f49f2455c 100644
--- a/sys/dev/isa/files.isapnp
+++ b/sys/dev/isa/files.isapnp
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isapnp,v 1.2 1997/12/25 09:22:36 downsj Exp $
+#	$OpenBSD: files.isapnp,v 1.3 1997/12/25 14:14:55 downsj Exp $
 #	$NetBSD: files.isapnp,v 1.7 1997/10/16 17:16:36 matt Exp $
 #
 # Config file and device description for machine-independent ISAPnP code.
@@ -17,4 +17,7 @@ file	dev/isa/isapnpres.c		isapnp
 # MI PnP devices go here...
 #
 
-#attach  com at isapnp with com_isapnp
+#attach	com at isapnp with com_isapnp
+
+attach	sb at isapnp with sb_isapnp
+file	dev/isa/sb_isapnp.c		sb & (sb_isa | sb_isapnp) needs-flag
diff --git a/sys/dev/isa/pnpdevs.h b/sys/dev/isa/pnpdevs.h
index b6c7cbfc1e8..2c65c8b4dd5 100644
--- a/sys/dev/isa/pnpdevs.h
+++ b/sys/dev/isa/pnpdevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	#	OpenBSD: pnpdevs,v 1.6 1997/12/25 06:28:39 downsj Exp 
+ *	#	OpenBSD: pnpdevs,v 1.7 1997/12/25 14:13:13 downsj Exp 
  */
 
 struct isapnp_knowndev isapnp_knowndevs[] = {
@@ -36,6 +36,10 @@ struct isapnp_knowndev isapnp_knowndevs[] = {
 	{ "PNP81c8", "ed" },
 	{ "PNP828C", "le" },
 	{ "PNP828D", "le" },
+	{ "PNPB000", "sb" },
+	{ "PNPB001", "sb" },
+	{ "PNPB002", "sb" },
+	{ "PNPB003", "sb" },
 	{ "PNPC000", "com" },
 	{ "PNPC000", "pccom" },
 	{ "PNPC001", "com" },
@@ -45,5 +49,14 @@ struct isapnp_knowndev isapnp_knowndevs[] = {
 	{ "BDP0356", "com" },
 	{ "BDP0356", "pccom" },
 	{ "BRI1001", "le" },
+	{ "ADS7150", "sb" },
+	{ "ADS7180", "sb" },
+	{ "CTL0001", "sb" },
+	{ "CTL0031", "sb" },
+	{ "CTL0041", "sb" },
+	{ "CTL0042", "sb" },
+	{ "CTL0044", "sb" },
+	{ "CTL0045", "sb" },
+	{ "ESS1868", "sb" },
 	{ NULL, NULL, }
 };
diff --git a/sys/dev/isa/sb_isapnp.c b/sys/dev/isa/sb_isapnp.c
new file mode 100644
index 00000000000..4fdea839b29
--- /dev/null
+++ b/sys/dev/isa/sb_isapnp.c
@@ -0,0 +1,108 @@
+/*	$OpenBSD: sb_isapnp.c,v 1.1 1997/12/25 14:14:57 downsj Exp $	*/
+/*	$NetBSD: sb_isa.c,v 1.3 1997/03/20 11:03:11 mycroft Exp $	*/
+
+/*
+ * Copyright (c) 1991-1993 Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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 Computer Systems
+ *	Engineering Group at Lawrence Berkeley Laboratory.
+ * 4. Neither the name of the University nor of the Laboratory may be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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/errno.h>
+#include <sys/ioctl.h>
+#include <sys/syslog.h>
+#include <sys/device.h>
+#include <sys/proc.h>
+
+#include <sys/audioio.h>
+#include <dev/audio_if.h>
+#include <dev/mulaw.h>
+
+#include <dev/isa/isavar.h>
+#include <dev/isa/isadmavar.h>
+
+#include <dev/isa/sbreg.h>
+#include <dev/isa/sbvar.h>
+
+#include <dev/isa/sbdspvar.h>
+
+int	sb_isapnp_match __P((struct device *, void *, void *));
+void	sb_isapnp_attach __P((struct device *, struct device *, void *));
+
+struct cfattach sb_isapnp_ca = {
+	sizeof(struct sbdsp_softc), sb_isapnp_match, sb_isapnp_attach
+};
+
+/*
+ * Probe / attach routines.
+ */
+
+/*
+ * Probe for the soundblaster hardware.
+ */
+int
+sb_isapnp_match(parent, match, aux)
+	struct device *parent;
+	void *match, *aux;
+{
+	return 1;
+}
+
+/*
+ * Attach hardware to driver, attach hardware driver to audio
+ * pseudo-device driver.
+ */
+void
+sb_isapnp_attach(parent, self, aux)
+	struct device *parent, *self;
+	void *aux;
+{
+	register struct sbdsp_softc *sc = (struct sbdsp_softc *) self;
+	register struct isa_attach_args *ia = aux;
+
+	sc->sc_iot = ia->ia_iot;
+	sc->sc_ioh = ia->ipa_io[0].h;
+	sc->sc_iobase = ia->ipa_io[0].base;
+	sc->sc_irq = ia->ipa_irq[0].num;
+	sc->sc_drq8 = ia->ipa_drq[0].num;
+	sc->sc_drq16 = ia->ipa_drq[1].num;
+	sc->sc_ic = ia->ia_ic;
+
+	if (!sbmatch(sc)) {
+		printf("%s: sbmatch failed\n", sc->sc_dev.dv_xname);
+		return;
+	}
+
+	printf(" <%s, %s>", ia->ipa_devident, ia->ipa_devclass);
+
+	sbattach(sc);
+}