NetBSD 960317 merge

4 files changed, 102 insertions, 9 deletions

diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h
new file mode 100644
index 00000000000..9b412b06936
--- /dev/null
+++ b/sys/dev/ic/comvar.h
@@ -0,0 +1,48 @@
+/*	$OpenBSD: comvar.h,v 1.1 1996/04/19 16:08:34 niklas Exp $	*/
+/*	$NetBSD: comvar.h,v 1.3 1996/03/10 09:01:26 cgd Exp $	*/
+
+/*
+ * Copyright (c) 1996 Christopher G. Demetriou.  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 Christopher G. Demetriou
+ *	for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 commulti_attach_args {
+	int		ca_slave;		/* slave number */
+
+	bus_chipset_tag_t ca_bc;
+	bus_io_handle_t ca_ioh;
+	int		ca_iobase;
+	int		ca_noien;
+};
+
+int comprobe1 __P((bus_chipset_tag_t, bus_io_handle_t, int));
+
+extern int comconsaddr;
+extern int comconsattached;
+extern bus_chipset_tag_t comconsbc;
+extern bus_io_handle_t comconsioh;
diff --git a/sys/dev/isa/comvar.h b/sys/dev/isa/comvar.h
new file mode 100644
index 00000000000..9b412b06936
--- /dev/null
+++ b/sys/dev/isa/comvar.h
@@ -0,0 +1,48 @@
+/*	$OpenBSD: comvar.h,v 1.1 1996/04/19 16:08:34 niklas Exp $	*/
+/*	$NetBSD: comvar.h,v 1.3 1996/03/10 09:01:26 cgd Exp $	*/
+
+/*
+ * Copyright (c) 1996 Christopher G. Demetriou.  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 Christopher G. Demetriou
+ *	for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 commulti_attach_args {
+	int		ca_slave;		/* slave number */
+
+	bus_chipset_tag_t ca_bc;
+	bus_io_handle_t ca_ioh;
+	int		ca_iobase;
+	int		ca_noien;
+};
+
+int comprobe1 __P((bus_chipset_tag_t, bus_io_handle_t, int));
+
+extern int comconsaddr;
+extern int comconsattached;
+extern bus_chipset_tag_t comconsbc;
+extern bus_io_handle_t comconsioh;
diff --git a/sys/dev/pci/Makefile b/sys/dev/pci/Makefile
index 33676ded48b..bbf68541505 100644
--- a/sys/dev/pci/Makefile
+++ b/sys/dev/pci/Makefile
@@ -1,3 +1,4 @@
+#	$OpenBSD: Makefile,v 1.3 1996/04/19 16:08:38 niklas Exp $
 #	$NetBSD: Makefile,v 1.1 1995/06/18 01:07:04 cgd Exp $
 
 AWK=	awk --posix
diff --git a/sys/dev/pci/aic7870.c b/sys/dev/pci/aic7870.c
index 3b8e44de258..b481014d4f0 100644
--- a/sys/dev/pci/aic7870.c
+++ b/sys/dev/pci/aic7870.c
@@ -1,5 +1,4 @@
-/*	$OpenBSD: aic7870.c,v 1.5 1996/04/18 23:47:54 niklas Exp $	*/
-/*	$NetBSD: aic7870.c,v 1.8 1996/03/17 00:55:23 thorpej Exp $	*/
+/*	$NetBSD: aic7870.c,v 1.7 1996/03/04 19:30:50 cgd Exp $	*/
 
 /*
  * Product specific probe and attach routines for:
@@ -46,12 +45,9 @@
 static int aic7870_probe __P((struct device *, void *, void *));
 static void aic7870_attach __P((struct device *, struct device *, void *));
 
-struct cfattach ahc_ca = {
-	sizeof(struct ahc_softc), aic7870_probe, aic7870_attach
-};
-
-struct cfdriver ahc_cd = {
-        NULL, "ahc", DV_DULL
+struct cfdriver ahccd = {
+        NULL, "ahc", aic7870_probe, aic7870_attach, DV_DULL, 
+        sizeof(struct ahc_softc)
 }; 
 
 int ahcintr __P((void *));
@@ -110,6 +106,6 @@ aic7870_attach(parent, self, aux)
 
 	ahcattach(ahc);
 
-	ahc->sc_ih = pci_map_int(pa->pa_tag, IPL_BIO, ahcintr, ahc
+	ahc->sc_ih = pci_map_int(pa->pa_tag, IPL_BIO, ahcintr, ahc,
 	    ahc->sc_dev.dv_xname);
 }