Second parameter of *match functions should be void (thank you ISA bus) and

*stop functions return int's under OpenBSD.  This cleans up a
bunch of compile-time warnings for the mac68k.

4 files changed, 20 insertions, 16 deletions

diff --git a/sys/arch/mac68k/dev/z8530tty.c b/sys/arch/mac68k/dev/z8530tty.c
index 99e293fcf93..cb35ad8adbc 100644
--- a/sys/arch/mac68k/dev/z8530tty.c
+++ b/sys/arch/mac68k/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530tty.c,v 1.6 1997/01/24 01:35:38 briggs Exp $	*/
+/*	$OpenBSD: z8530tty.c,v 1.7 1997/03/11 21:03:02 gene Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.10 1996/12/18 05:17:44 scottr Exp $	*/
 
 /*
@@ -87,7 +87,7 @@ struct zstty_stats z8530tty_stats;
 
 
 /* Definition of the driver for autoconfig. */
-static int	zstty_match(struct device *, struct cfdata *, void *);
+static int	zstty_match(struct device *, void *, void *);
 static void	zstty_attach(struct device *, struct device *, void *);
 
 struct cfattach zstty_ca = {
@@ -117,12 +117,13 @@ static int	zsgetbaud __P((register struct zs_chanstate *,
  * zstty_match: how is this zs channel configured?
  */
 int 
-zstty_match(parent, cf, aux)
+zstty_match(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
+	void *vcf;
 	void *aux;
 {
 	struct zsc_attach_args *args = aux;
+	struct cfdata *cf = vcf;
 
 	/* Exact match is better than wildcard. */
 	if (cf->cf_loc[0] == args->channel)
@@ -669,6 +670,7 @@ zsstop(tp, flag)
 			tp->t_state |= TS_FLUSH;
 	}
 	splx(s);
+	return(0);
 }
 
 #ifndef ZS_TOLERANCE
diff --git a/sys/arch/mac68k/dev/zs.c b/sys/arch/mac68k/dev/zs.c
index 38351e14111..8cdeb5fa071 100644
--- a/sys/arch/mac68k/dev/zs.c
+++ b/sys/arch/mac68k/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zs.c,v 1.7 1997/01/24 01:35:39 briggs Exp $	*/
+/*	$OpenBSD: zs.c,v 1.8 1997/03/11 21:03:03 gene Exp $	*/
 /*	$NetBSD: zs.c,v 1.12 1996/12/18 05:04:22 scottr Exp $	*/
 
 /*
@@ -184,7 +184,7 @@ static u_char zs_init_reg[16] = {
  ****************************************************************/
 
 /* Definition of the driver for autoconfig. */
-static int	zsc_match __P((struct device *, struct cfdata *, void *));
+static int	zsc_match __P((struct device *, void *, void *));
 static void	zsc_attach __P((struct device *, struct device *, void *));
 static int	zsc_print __P((void *aux, const char *name));
 
@@ -206,7 +206,7 @@ int	zssoft __P((void *));
 static int
 zsc_match(parent, cf, aux)
 	struct device *parent;
-	struct cfdata *cf;
+	void *cf;
 	void *aux;
 {
 	return 1;
diff --git a/sys/arch/mac68k/mac68k/fpu.c b/sys/arch/mac68k/mac68k/fpu.c
index 904c34deadd..345d9ecb866 100644
--- a/sys/arch/mac68k/mac68k/fpu.c
+++ b/sys/arch/mac68k/mac68k/fpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu.c,v 1.7 1997/01/24 01:35:45 briggs Exp $	*/
+/*	$OpenBSD: fpu.c,v 1.8 1997/03/11 21:03:04 gene Exp $	*/
 /*	$NetBSD: fpu.c,v 1.21 1996/12/16 16:17:16 scottr Exp $	*/
 
 /*-
@@ -59,7 +59,7 @@ int     fputype;
 
 extern int *nofault;
 
-static int  fpu_match __P((struct device *, struct cfdata *, void *));
+static int  fpu_match __P((struct device *, void *, void *));
 static void fpu_attach __P((struct device *, struct device *, void *));
 static int  fpu_probe __P((void));
 
@@ -74,7 +74,7 @@ struct cfdriver fpu_cd = {
 static int
 fpu_match(parent, cf, aux)
 	struct device *parent;
-	struct cfdata *cf;
+	void *cf;
 	void *aux;
 {
 	return 1;
diff --git a/sys/arch/mac68k/mac68k/mainbus.c b/sys/arch/mac68k/mac68k/mainbus.c
index 4960713f548..b7eea67fa30 100644
--- a/sys/arch/mac68k/mac68k/mainbus.c
+++ b/sys/arch/mac68k/mac68k/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.4 1997/01/24 01:35:49 briggs Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.5 1997/03/11 21:03:04 gene Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.7 1996/12/17 06:47:41 scottr Exp $	*/
 
 /*
@@ -41,9 +41,9 @@
 #include <sys/device.h>
 #include <sys/systm.h>
 
-static int	mainbus_match __P((struct device *, struct cfdata *, void *));
+static int	mainbus_match __P((struct device *, void *, void *));
 static void	mainbus_attach __P((struct device *, struct device *, void *));
-static int	mainbus_search __P((struct device *, struct cfdata *, void *));
+static int	mainbus_search __P((struct device *, void *, void *));
 
 struct cfattach mainbus_ca = {
 	sizeof(struct device), mainbus_match, mainbus_attach
@@ -56,7 +56,7 @@ struct cfdriver mainbus_cd = {
 static int
 mainbus_match(parent, cf, aux)
 	struct device *parent;
-	struct cfdata *cf;
+	void *cf;
 	void *aux;
 {
 	static int mainbus_matched = 0;
@@ -81,11 +81,13 @@ mainbus_attach(parent, self, aux)
 }
 
 static int
-mainbus_search(parent, cf, aux)
+mainbus_search(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
+	void *vcf;
 	void *aux;
 {
+	struct cfdata *cf = vcf;
+
 	if ((*cf->cf_attach->ca_match)(parent, cf, NULL) > 0)
 		config_attach(parent, cf, NULL, NULL);
 	return 0;