proto updates

3 files changed, 30 insertions, 23 deletions

diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index a092b796fc4..32331305bc5 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: ast.c,v 1.9 1996/04/27 21:08:46 niklas Exp $	*/
-/*	$NetBSD: ast.c,v 1.26 1996/04/15 18:55:23 cgd Exp $	*/
+/*	$OpenBSD: ast.c,v 1.10 1996/05/10 12:35:41 deraadt Exp $	*/
+/*	$NetBSD: ast.c,v 1.27 1996/05/05 19:49:54 christos Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -35,6 +35,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 
@@ -63,9 +64,10 @@ struct ast_softc {
 	bus_io_handle_t sc_slaveioh[NSLAVES];
 };
 
-int astprobe();
-void astattach();
+int astprobe __P((struct device *, void *, void *));
+void astattach __P((struct device *, struct device *, void *));
 int astintr __P((void *));
+int astprint __P((void *, char *));
 
 struct cfattach ast_ca = {
 	sizeof(struct ast_softc), astprobe, astattach
@@ -77,7 +79,8 @@ struct cfdriver ast_cd = {
 
 int
 astprobe(parent, self, aux)
-	struct device *parent, *self;
+	struct device *parent;
+	void *self;
 	void *aux;
 {
 	struct isa_attach_args *ia = aux;
@@ -147,7 +150,8 @@ astattach(parent, self, aux)
 	struct ast_softc *sc = (void *)self;
 	struct isa_attach_args *ia = aux;
 	struct commulti_attach_args ca;
-	int i, subunit;
+	bus_chipset_tag_t bc = ia->ia_bc;
+	int i;
 
 	sc->sc_bc = ia->ia_bc;
 	sc->sc_iobase = ia->ia_iobase;
@@ -165,8 +169,6 @@ astattach(parent, self, aux)
 	printf("\n");
 
 	for (i = 0; i < NSLAVES; i++) {
-		struct cfdata *match;
-
 		ca.ca_slave = i;
 		ca.ca_bc = sc->sc_bc;
 		ca.ca_ioh = sc->sc_slaveioh[i];
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index c4ece6a26c5..a53a052500a 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: boca.c,v 1.8 1996/04/21 22:22:52 deraadt Exp $ */
-/*	$NetBSD: boca.c,v 1.13 1996/04/15 18:55:28 cgd Exp $	*/
+/*	$OpenBSD: boca.c,v 1.9 1996/05/10 12:35:42 deraadt Exp $ */
+/*	$NetBSD: boca.c,v 1.14 1996/05/05 19:49:55 christos Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -35,6 +35,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 
@@ -63,9 +64,10 @@ struct boca_softc {
 	bus_io_handle_t sc_slaveioh[NSLAVES];
 };
 
-int bocaprobe();
-void bocaattach();
+int bocaprobe __P((struct device *, void *, void *));
+void bocaattach __P((struct device *, struct device *, void *));
 int bocaintr __P((void *));
+int bocaprint __P((void *, char *));
 
 struct cfattach boca_ca = {
 	sizeof(struct boca_softc), bocaprobe, bocaattach,
@@ -77,7 +79,8 @@ struct cfdriver boca_cd = {
 
 int
 bocaprobe(parent, self, aux)
-	struct device *parent, *self;
+	struct device *parent;
+	void *self;
 	void *aux;
 {
 	struct isa_attach_args *ia = aux;
@@ -147,7 +150,8 @@ bocaattach(parent, self, aux)
 	struct boca_softc *sc = (void *)self;
 	struct isa_attach_args *ia = aux;
 	struct commulti_attach_args ca;
-	int i, subunit;
+	bus_chipset_tag_t bc = ia->ia_bc;
+	int i;
 
 	sc->sc_bc = ia->ia_bc;
 	sc->sc_iobase = ia->ia_iobase;
@@ -160,7 +164,6 @@ bocaattach(parent, self, aux)
 	printf("\n");
 
 	for (i = 0; i < NSLAVES; i++) {
-		struct cfdata *match;
 
 		ca.ca_slave = i;
 		ca.ca_bc = sc->sc_bc;
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index 1afdc1ccfda..9ab6e9359ea 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: rtfps.c,v 1.8 1996/04/21 22:24:28 deraadt Exp $       */
-/*	$NetBSD: rtfps.c,v 1.21 1996/04/15 18:55:31 cgd Exp $	*/
+/*	$OpenBSD: rtfps.c,v 1.9 1996/05/10 12:35:41 deraadt Exp $       */
+/*	$NetBSD: rtfps.c,v 1.22 1996/05/05 19:49:51 christos Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -35,6 +35,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 
@@ -65,9 +66,10 @@ struct rtfps_softc {
 	bus_io_handle_t sc_slaveioh[NSLAVES];
 };
 
-int rtfpsprobe();
-void rtfpsattach();
+int rtfpsprobe __P((struct device *, void *, void *));
+void rtfpsattach __P((struct device *, struct device *, void *));
 int rtfpsintr __P((void *));
+int rtfpsprint __P((void *, char *));
 
 struct cfattach rtfps_ca = {
 	sizeof(struct rtfps_softc), rtfpsprobe, rtfpsattach
@@ -79,7 +81,8 @@ struct cfdriver rtfps_cd = {
 
 int
 rtfpsprobe(parent, self, aux)
-	struct device *parent, *self;
+	struct device *parent;
+	void *self;
 	void *aux;
 {
 	struct isa_attach_args *ia = aux;
@@ -156,7 +159,8 @@ rtfpsattach(parent, self, aux)
 		IOBASEUNK,     0x2f2,     0x6f2,     0x6f3,
 		IOBASEUNK, IOBASEUNK, IOBASEUNK, IOBASEUNK
 	};
-	int i, subunit;
+	bus_chipset_tag_t bc = ia->ia_bc;
+	int i;
 
 	sc->sc_bc = ia->ia_bc;
 	sc->sc_iobase = ia->ia_iobase;
@@ -178,8 +182,6 @@ rtfpsattach(parent, self, aux)
 	printf("\n");
 
 	for (i = 0; i < NSLAVES; i++) {
-		struct cfdata *match;
-
 		ca.ca_slave = i;
 		ca.ca_bc = sc->sc_bc;
 		ca.ca_ioh = sc->sc_slaveioh[i];