diff --git a/sys/arch/amiga/amiga/autoconf.c b/sys/arch/amiga/amiga/autoconf.c
index b6dabfea8ab8..1cfd501d4996 100644
--- a/sys/arch/amiga/amiga/autoconf.c
+++ b/sys/arch/amiga/amiga/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.44 1996/12/17 11:43:12 is Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.45 1996/12/23 09:15:39 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -44,7 +44,7 @@ void setroot __P((void));
 void swapconf __P((void));
 void mbattach __P((struct device *, struct device *, void *));
 int mbprint __P((void *, const char *));
-int mbmatch __P((struct device *, void *, void *));
+int mbmatch __P((struct device *, struct cfdata *, void *));
 
 int cold;	/* 1 if still booting */
 #include <sys/kernel.h>
@@ -221,11 +221,11 @@ struct cfdriver mainbus_cd = {
 };
 
 int
-mbmatch(pdp, match, auxp)
-	struct device *pdp;
-	void *match, *auxp;
+mbmatch(pdp, cfp, auxp)
+	struct device	*pdp;
+	struct cfdata	*cfp;
+	void		*auxp;
 {
-	struct cfdata *cfp = match;
 
 	if (cfp->cf_unit > 0)
 		return(0);
diff --git a/sys/arch/amiga/dev/afsc.c b/sys/arch/amiga/dev/afsc.c
index dcdb04992e5f..589c98e4d123 100644
--- a/sys/arch/amiga/dev/afsc.c
+++ b/sys/arch/amiga/dev/afsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: afsc.c,v 1.19 1996/12/10 21:27:18 thorpej Exp $	*/
+/*	$NetBSD: afsc.c,v 1.20 1996/12/23 09:09:49 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -52,7 +52,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void afscattach __P((struct device *, struct device *, void *));
-int afscmatch __P((struct device *, void *, void *));
+int afscmatch __P((struct device *, struct cfdata *, void *));
 int afsc_dmaintr __P((void *));
 #ifdef DEBUG
 void afsc_dump __P((void));
@@ -96,9 +96,10 @@ struct cfdriver aftsc_cd = {
  * if we are a Commodore Amiga A4091 or possibly an A4000T
  */
 int
-afscmatch(pdp, match, auxp)
+afscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 	siop_regmap_p rp;
diff --git a/sys/arch/amiga/dev/ahsc.c b/sys/arch/amiga/dev/ahsc.c
index bfc1c911871f..790d63c2f4e0 100644
--- a/sys/arch/amiga/dev/ahsc.c
+++ b/sys/arch/amiga/dev/ahsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahsc.c,v 1.17 1996/12/10 21:27:19 thorpej Exp $	*/
+/*	$NetBSD: ahsc.c,v 1.18 1996/12/23 09:09:51 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -52,7 +52,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void ahscattach __P((struct device *, struct device *, void *));
-int ahscmatch __P((struct device *, void *, void *));
+int ahscmatch __P((struct device *, struct cfdata *, void *));
 
 void ahsc_enintr __P((struct sbic_softc *));
 void ahsc_dmastop __P((struct sbic_softc *));
@@ -95,9 +95,10 @@ struct cfdriver ahsc_cd = {
  * if we are an A3000 we are here.
  */
 int
-ahscmatch(pdp, match, auxp)
+ahscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	char *mbusstr;
 
diff --git a/sys/arch/amiga/dev/atzsc.c b/sys/arch/amiga/dev/atzsc.c
index b9b30de7158e..cfaf58aebfa5 100644
--- a/sys/arch/amiga/dev/atzsc.c
+++ b/sys/arch/amiga/dev/atzsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: atzsc.c,v 1.21 1996/12/10 21:27:20 thorpej Exp $	*/
+/*	$NetBSD: atzsc.c,v 1.22 1996/12/23 09:09:52 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -52,7 +52,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void atzscattach __P((struct device *, struct device *, void *));
-int atzscmatch __P((struct device *, void *, void *));
+int atzscmatch __P((struct device *, struct cfdata *, void *));
 
 void atzsc_enintr __P((struct sbic_softc *));
 void atzsc_dmastop __P((struct sbic_softc *));
@@ -95,9 +95,10 @@ struct cfdriver atzsc_cd = {
  * if we are an A3000 we are here.
  */
 int
-atzscmatch(pdp, match, auxp)
+atzscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/bzsc.c b/sys/arch/amiga/dev/bzsc.c
index 498136c73338..d3ff95ed0734 100644
--- a/sys/arch/amiga/dev/bzsc.c
+++ b/sys/arch/amiga/dev/bzsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzsc.c,v 1.13 1996/10/13 03:06:50 christos Exp $	*/
+/*	$NetBSD: bzsc.c,v 1.14 1996/12/23 09:09:53 veego Exp $	*/
 
 /*
  * Copyright (c) 1995 Daniel Widenfalk
@@ -58,7 +58,7 @@
 #include <amiga/dev/bzscvar.h>
 
 void bzscattach __P((struct device *, struct device *, void *));
-int  bzscmatch  __P((struct device *, void *, void *));
+int  bzscmatch  __P((struct device *, struct cfdata *, void *));
 
 struct scsi_adapter bzsc_scsiswitch = {
 	sfas_scsicmd,
@@ -96,9 +96,10 @@ void bzsc_led_dummy	__P((struct sfas_softc *sc, int mode));
  * if we are an Advanced Systems & Software FastlaneZ3
  */
 int
-bzscmatch(pdp, match, auxp)
+bzscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 	vu_char *ta;
diff --git a/sys/arch/amiga/dev/bztzsc.c b/sys/arch/amiga/dev/bztzsc.c
index a2278e1822b6..cf51d3ab9efd 100644
--- a/sys/arch/amiga/dev/bztzsc.c
+++ b/sys/arch/amiga/dev/bztzsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bztzsc.c,v 1.1 1996/12/16 16:17:29 is Exp $	*/
+/*	$NetBSD: bztzsc.c,v 1.2 1996/12/23 09:09:54 veego Exp $	*/
 
 /*
  * Copyright (c) 1996 Ignatios Souvatzis
@@ -56,7 +56,7 @@
 #include <amiga/dev/bztzscvar.h>
 
 void bztzscattach __P((struct device *, struct device *, void *));
-int  bztzscmatch  __P((struct device *, void *, void *));
+int  bztzscmatch  __P((struct device *, struct cfdata *, void *));
 
 struct scsi_adapter bztzsc_scsiswitch = {
 	sfas_scsicmd,
@@ -93,9 +93,10 @@ void bztzsc_led		 __P((struct sfas_softc *sc, int mode));
  * If we are an Phase 5 Devices Blizzard-2060 SCSI option:
  */
 int
-bztzscmatch(pdp, match, auxp)
+bztzscmatch(pdp, cfp, auxp)
 	struct device	*pdp;
-	void		*match, *auxp;
+	struct cfdata	*cfp;
+	void		*auxp;
 {
 	struct zbus_args *zap;
 	volatile u_int8_t *ta;
diff --git a/sys/arch/amiga/dev/clock.c b/sys/arch/amiga/dev/clock.c
index 87d35a40380b..513afa2de1b3 100644
--- a/sys/arch/amiga/dev/clock.c
+++ b/sys/arch/amiga/dev/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.23 1996/12/17 11:43:10 is Exp $	*/
+/*	$NetBSD: clock.c,v 1.24 1996/12/23 09:09:55 veego Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -86,7 +86,7 @@ struct CIA *clockcia;
  * periods where N is the value loaded into the counter.
  */
 
-int clockmatch __P((struct device *, void *, void *));
+int clockmatch __P((struct device *, struct cfdata *, void *));
 void clockattach __P((struct device *, struct device *, void *));
 void cpu_initclocks __P((void));
 void calibrate_delay __P((struct device *));
@@ -99,9 +99,10 @@ struct cfdriver clock_cd = {
 	NULL, "clock", DV_DULL, NULL, 0 };
 
 int
-clockmatch(pdp, match, auxp)
+clockmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	if (matchname("clock", auxp))
 		return(1);
diff --git a/sys/arch/amiga/dev/drcom.c b/sys/arch/amiga/dev/drcom.c
index fc880a655843..c7c08b50a8ef 100644
--- a/sys/arch/amiga/dev/drcom.c
+++ b/sys/arch/amiga/dev/drcom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: drcom.c,v 1.1 1996/11/30 00:43:02 is Exp $	*/
+/*	$NetBSD: drcom.c,v 1.2 1996/12/23 09:09:56 veego Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995, 1996
@@ -137,7 +137,7 @@ static u_char tiocm_xxx2mcr __P((int));
  * XXX the following two cfattach structs should be different, and possibly
  * XXX elsewhere.
  */
-int drcommatch __P((struct device *, void *, void *));
+int drcommatch __P((struct device *, struct cfdata *, void *));
 void drcomattach __P((struct device *, struct device *, void *));
 
 struct cfattach drcom_ca = {
@@ -206,16 +206,16 @@ drcomspeed(speed)
 }
 
 int
-drcommatch(parent, match, auxp)
+drcommatch(parent, cfp, auxp)
 	struct device *parent;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cdp = (struct cfdata *)match;
 
 	/* Exactly two of us live on the DraCo */
 
 	if (is_draco() && matchname(auxp, "drcom") &&
-	    (cdp->cf_unit >= 0) && (cdp->cf_unit < 2))
+	    (cfp->cf_unit >= 0) && (cfp->cf_unit < 2))
 		return 1;
 
 	return 0;
diff --git a/sys/arch/amiga/dev/drsc.c b/sys/arch/amiga/dev/drsc.c
index af441652f690..72d977fc9057 100644
--- a/sys/arch/amiga/dev/drsc.c
+++ b/sys/arch/amiga/dev/drsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: drsc.c,v 1.8 1996/12/10 21:27:21 thorpej Exp $	*/
+/*	$NetBSD: drsc.c,v 1.9 1996/12/23 09:09:57 veego Exp $	*/
 
 /*
  * Copyright (c) 1996 Ignatios Souvatzis
@@ -52,7 +52,7 @@
 #include <amiga/amiga/drcustom.h>
 
 void drscattach __P((struct device *, struct device *, void *));
-int drscmatch __P((struct device *, void *, void *));
+int drscmatch __P((struct device *, struct cfdata *, void *));
 int drsc_dmaintr __P((struct siop_softc *));
 #ifdef DEBUG
 void drsc_dump __P((void));
@@ -92,12 +92,12 @@ static struct siop_softc *drsc_softc;
  * One of us is on every DraCo motherboard, 
  */
 int
-drscmatch(pdp, match, auxp)
+drscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cdp = (struct cfdata *)match;
-	if (is_draco() && matchname(auxp, "drsc") && (cdp->cf_unit == 0))
+	if (is_draco() && matchname(auxp, "drsc") && (cfp->cf_unit == 0))
 		return(1);
 	return(0);
 }
diff --git a/sys/arch/amiga/dev/empsc.c b/sys/arch/amiga/dev/empsc.c
index 897069ed6a81..831bc88cc079 100644
--- a/sys/arch/amiga/dev/empsc.c
+++ b/sys/arch/amiga/dev/empsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: empsc.c,v 1.12 1996/12/10 21:27:22 thorpej Exp $	*/
+/*	$NetBSD: empsc.c,v 1.13 1996/12/23 09:09:58 veego Exp $	*/
 
 /*
 
@@ -50,7 +50,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void empscattach __P((struct device *, struct device *, void *));
-int empscmatch __P((struct device *, void *, void *));
+int empscmatch __P((struct device *, struct cfdata *, void *));
 int empsc_intr __P((void *));
 
 struct scsi_adapter empsc_scsiswitch = {
@@ -85,9 +85,10 @@ struct cfdriver empsc_cd = {
  * if this is an EMPLANT board
  */
 int
-empscmatch(pdp, match, auxp)
+empscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/fd.c b/sys/arch/amiga/dev/fd.c
index 9869e81b313d..9ee94524189c 100644
--- a/sys/arch/amiga/dev/fd.c
+++ b/sys/arch/amiga/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.35 1996/10/13 03:06:55 christos Exp $	*/
+/*	$NetBSD: fd.c,v 1.36 1996/12/23 09:09:59 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -180,10 +180,10 @@ struct fdcargs {
 	int unit;
 };
 
-int	fdcmatch __P((struct device *, void *, void *));
+int	fdcmatch __P((struct device *, struct cfdata *, void *));
 void	fdcattach __P((struct device *, struct device *, void *));
 int	fdcprint __P((void *, const char *));
-int	fdmatch __P((struct device *, void *, void *));
+int	fdmatch __P((struct device *, struct cfdata *, void *));
 void	fdattach __P((struct device *, struct device *, void *));
 
 void	fdintr __P((int));
@@ -308,11 +308,11 @@ struct cfdriver fdc_cd = {
 
 
 int
-fdcmatch(pdp, match, auxp)
+fdcmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cfp = match;
 
 	if (matchname("fdc", auxp) == 0 || cfp->cf_unit != 0)
 		return(0);
@@ -360,11 +360,11 @@ fdcprint(auxp, pnp)
 
 /*ARGSUSED*/
 int
-fdmatch(pdp, match, auxp)
+fdmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cfp = match;
 
 #define cf_unit	cf_loc[0]
 	struct fdcargs *fdap;
diff --git a/sys/arch/amiga/dev/flsc.c b/sys/arch/amiga/dev/flsc.c
index 43e7185412ca..647330a45887 100644
--- a/sys/arch/amiga/dev/flsc.c
+++ b/sys/arch/amiga/dev/flsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: flsc.c,v 1.13 1996/12/10 21:27:23 thorpej Exp $	*/
+/*	$NetBSD: flsc.c,v 1.14 1996/12/23 09:10:00 veego Exp $	*/
 
 /*
  * Copyright (c) 1995 Daniel Widenfalk
@@ -58,7 +58,7 @@
 #include <amiga/dev/flscvar.h>
 
 void flscattach __P((struct device *, struct device *, void *));
-int  flscmatch  __P((struct device *, void *, void *));
+int  flscmatch  __P((struct device *, struct cfdata *, void *));
 
 struct scsi_adapter flsc_scsiswitch = {
 	sfas_scsicmd,
@@ -97,9 +97,10 @@ void flsc_led		 __P((struct sfas_softc *sc, int mode));
  * if we are an Advanced Systems & Software FastlaneZ3
  */
 int
-flscmatch(pdp, match, auxp)
+flscmatch(pdp, cfp, auxp)
 	struct device	*pdp;
-	void		*match, *auxp;
+	struct cfdata	*cfp;
+	void		*auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/grf.c b/sys/arch/amiga/dev/grf.c
index aadadf0ee6f9..2d3017808536 100644
--- a/sys/arch/amiga/dev/grf.c
+++ b/sys/arch/amiga/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf.c,v 1.31 1996/10/13 03:06:58 christos Exp $	*/
+/*	$NetBSD: grf.c,v 1.32 1996/12/23 09:10:01 veego Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -95,7 +95,7 @@ int grfbanked_set __P((dev_t, int));
 #endif
 
 void grfattach __P((struct device *, struct device *, void *));
-int grfmatch __P((struct device *, void *, void *));
+int grfmatch __P((struct device *, struct cfdata *, void *));
 int grfprint __P((void *, const char *));
 /*
  * pointers to grf drivers device structs 
@@ -120,11 +120,11 @@ static struct cfdata *cfdata;
  * low level board driver.
  */
 int
-grfmatch(pdp, match, auxp)
+grfmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cfp = match;
 
 	if (cfp->cf_unit != ((struct grf_softc *)pdp)->g_unit)
 		return(0);
diff --git a/sys/arch/amiga/dev/grf_cc.c b/sys/arch/amiga/dev/grf_cc.c
index f920ebf3e18d..41e8979c3a52 100644
--- a/sys/arch/amiga/dev/grf_cc.c
+++ b/sys/arch/amiga/dev/grf_cc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_cc.c,v 1.22 1996/10/13 03:06:59 christos Exp $	*/
+/*	$NetBSD: grf_cc.c,v 1.23 1996/12/23 09:10:02 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -60,7 +60,7 @@
 
 #include "view.h" 
 
-int grfccmatch __P((struct device *, void *, void *));
+int grfccmatch __P((struct device *, struct cfdata *, void *));
 int grfccprint __P((void *, const char *));
 void grfccattach __P((struct device *, struct device *, void *));
 void grf_cc_on __P((struct grf_softc *));
@@ -83,11 +83,11 @@ static struct cfdata *cfdata;
  * tricky regarding the console.
  */
 int 
-grfccmatch(pdp, match, auxp)
+grfccmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cfp = match;
 	static int ccconunit = -1;
 	char *mainbus_name = auxp;
 
diff --git a/sys/arch/amiga/dev/grf_cl.c b/sys/arch/amiga/dev/grf_cl.c
index 6562ddb5042d..1dadcfd404c8 100644
--- a/sys/arch/amiga/dev/grf_cl.c
+++ b/sys/arch/amiga/dev/grf_cl.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: grf_cl.c,v 1.17 1996/10/21 09:31:53 veego Exp $        */
+/*      $NetBSD: grf_cl.c,v 1.18 1996/12/23 09:10:04 veego Exp $        */
 
 /*
  * Copyright (c) 1995 Ezra Story
@@ -106,7 +106,7 @@ static void RegOffpass __P((volatile caddr_t));
 
 void grfclattach __P((struct device *, struct device *, void *));
 int grfclprint __P((void *, const char *));
-int grfclmatch __P((struct device *, void *, void *));
+int grfclmatch __P((struct device *, struct cfdata *, void *));
 void cl_memset __P((unsigned char *, unsigned char, int));
 
 /* Graphics display definitions.
@@ -182,13 +182,11 @@ struct cfdriver grfcl_cd = {
 static struct cfdata *cfdata;
 
 int
-grfclmatch(pdp, match, auxp)
+grfclmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void   *match, *auxp;
+	struct cfdata *cfp;
+	void   *auxp;
 {
-#ifdef CL5426CONSOLE
-	struct cfdata *cfp = match;
-#endif
 	struct zbus_args *zap;
 	static int regprod, fbprod;
 	int error;
diff --git a/sys/arch/amiga/dev/grf_cv.c b/sys/arch/amiga/dev/grf_cv.c
index 70a8f5ec91b9..7d3f25ba001a 100644
--- a/sys/arch/amiga/dev/grf_cv.c
+++ b/sys/arch/amiga/dev/grf_cv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_cv.c,v 1.19 1996/10/22 16:59:56 veego Exp $	*/
+/*	$NetBSD: grf_cv.c,v 1.20 1996/12/23 09:10:05 veego Exp $	*/
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -67,7 +67,7 @@
 #include <amiga/dev/grf_cvreg.h>
 #include <amiga/dev/zbusvar.h>
 
-int	grfcvmatch  __P((struct device *, void *, void *));
+int	grfcvmatch  __P((struct device *, struct cfdata *, void *));
 void	grfcvattach __P((struct device *, struct device *, void *));
 int	grfcvprint  __P((void *, const char *));
 
@@ -293,12 +293,12 @@ cv_has_4mb(fb)
 }
 
 int
-grfcvmatch(pdp, match, auxp)
+grfcvmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 #ifdef CV64CONSOLE
-	struct cfdata *cfp = match;
 	static int cvcons_unit = -1;
 #endif
 	struct zbus_args *zap;
diff --git a/sys/arch/amiga/dev/grf_et.c b/sys/arch/amiga/dev/grf_et.c
index 1d6aa96a29a3..52ce70b98b15 100644
--- a/sys/arch/amiga/dev/grf_et.c
+++ b/sys/arch/amiga/dev/grf_et.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_et.c,v 1.7 1996/10/13 03:07:04 christos Exp $	*/
+/*	$NetBSD: grf_et.c,v 1.8 1996/12/23 09:10:06 veego Exp $	*/
 
 /*
  * Copyright (c) 1996 Tobias Abt
@@ -98,7 +98,7 @@ int	et_blank __P((struct grf_softc *gp, int *on));
 static int et_getControllerType __P((struct grf_softc *gp));
 static int et_getDACType __P((struct grf_softc *gp));
 
-int	grfetmatch __P((struct device *, void *, void *));
+int	grfetmatch __P((struct device *, struct cfdata *, void *));
 void	grfetattach __P((struct device *, struct device *, void *));
 int	grfetprint __P((void *, const char *));
 void	et_memset __P((unsigned char *d, unsigned char c, int l));
@@ -182,13 +182,11 @@ struct cfdriver grfet_cd = {
 static struct cfdata *cfdata;
 
 int
-grfetmatch(pdp, match, auxp)
+grfetmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-#ifdef TSENGCONSOLE
-	struct cfdata *cfp = match;
-#endif
 	struct zbus_args *zap;
 	static int regprod, fbprod;
 
diff --git a/sys/arch/amiga/dev/grf_rh.c b/sys/arch/amiga/dev/grf_rh.c
index c9be33a8f6e0..527afd803e49 100644
--- a/sys/arch/amiga/dev/grf_rh.c
+++ b/sys/arch/amiga/dev/grf_rh.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_rh.c,v 1.24 1996/10/13 03:07:05 christos Exp $	*/
+/*	$NetBSD: grf_rh.c,v 1.25 1996/12/23 09:10:07 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Markus Wild
@@ -1525,7 +1525,7 @@ static struct MonDef *current_mon;	/* EVIL */
 int  rh_mode     __P((struct grf_softc *, u_long, void *, u_long, int));
 void grfrhattach __P((struct device *, struct device *, void *));
 int  grfrhprint  __P((void *, const char *));
-int  grfrhmatch  __P((struct device *, void *, void *));
+int  grfrhmatch  __P((struct device *, struct cfdata *, void *));
 
 struct cfattach grfrh_ca = {
 	sizeof(struct grf_softc), grfrhmatch, grfrhattach
@@ -1538,12 +1538,12 @@ struct cfdriver grfrh_cd = {
 static struct cfdata *cfdata;
 
 int
-grfrhmatch(pdp, match, auxp)
+grfrhmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 #ifdef RETINACONSOLE
-	struct cfdata *cfp = match;
 	static int rhconunit = -1;
 #endif
 	struct zbus_args *zap;
diff --git a/sys/arch/amiga/dev/grf_rt.c b/sys/arch/amiga/dev/grf_rt.c
index ad581a7c36cf..a7587e884714 100644
--- a/sys/arch/amiga/dev/grf_rt.c
+++ b/sys/arch/amiga/dev/grf_rt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_rt.c,v 1.33 1996/10/13 03:07:06 christos Exp $	*/
+/*	$NetBSD: grf_rt.c,v 1.34 1996/12/23 09:10:09 veego Exp $	*/
 
 /*
  * Copyright (c) 1993 Markus Wild
@@ -765,7 +765,7 @@ rt_load_mon(gp, md)
 
 void grfrtattach __P((struct device *, struct device *, void *));
 int grfrtprint __P((void *, const char *));
-int grfrtmatch __P((struct device *, void *, void *));
+int grfrtmatch __P((struct device *, struct cfdata *, void *));
  
 int rt_mode __P((struct grf_softc *, u_long, void *, u_long, int));
 static int rt_getvmode __P((struct grf_softc *, struct grfvideo_mode *));
@@ -798,12 +798,12 @@ static struct cfdata *cfdata;
  * tricky regarding the console.
  */
 int 
-grfrtmatch(pdp, match, auxp)
+grfrtmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 #ifdef RETINACONSOLE
-	struct cfdata *cfp = match;
 	static int rtconunit = -1;
 #endif
 	struct zbus_args *zap;
diff --git a/sys/arch/amiga/dev/grf_ul.c b/sys/arch/amiga/dev/grf_ul.c
index abe2a3f3f899..5129355fefdd 100644
--- a/sys/arch/amiga/dev/grf_ul.c
+++ b/sys/arch/amiga/dev/grf_ul.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_ul.c,v 1.22 1996/10/13 03:07:07 christos Exp $	*/
+/*	$NetBSD: grf_ul.c,v 1.23 1996/12/23 09:10:10 veego Exp $	*/
 #define UL_DEBUG
 
 /*
@@ -440,7 +440,7 @@ int ul_mode __P((struct grf_softc *, u_long, void *, u_long, int));
 
 void grfulattach __P((struct device *, struct device *, void *));
 int grfulprint __P((void *, const char *));
-int grfulmatch __P((struct device *, void *, void *));
+int grfulmatch __P((struct device *, struct cfdata *, void *));
  
 struct cfattach grful_ca = {
 	sizeof(struct grf_ul_softc), grfulmatch, grfulattach
@@ -460,12 +460,12 @@ static struct cfdata *cfdata;
  * tricky regarding the console.
  */
 int 
-grfulmatch(pdp, match, auxp)
+grfulmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 #ifdef ULOWELLCONSOLE
-	struct cfdata *cfp = match;
 	static int ulconunit = -1;
 #endif
 	struct zbus_args *zap;
diff --git a/sys/arch/amiga/dev/gtsc.c b/sys/arch/amiga/dev/gtsc.c
index 3d0a15d64ebd..13f4698634eb 100644
--- a/sys/arch/amiga/dev/gtsc.c
+++ b/sys/arch/amiga/dev/gtsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gtsc.c,v 1.19 1996/10/13 03:07:11 christos Exp $	*/
+/*	$NetBSD: gtsc.c,v 1.20 1996/12/23 09:10:11 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -53,7 +53,7 @@
 #include <amiga/dev/gvpbusvar.h>
 
 void gtscattach __P((struct device *, struct device *, void *));
-int gtscmatch __P((struct device *, void *, void *));
+int gtscmatch __P((struct device *, struct cfdata *, void *));
 
 void gtsc_enintr __P((struct sbic_softc *));
 void gtsc_dmastop __P((struct sbic_softc *));
@@ -97,9 +97,10 @@ struct cfdriver gtsc_cd = {
 };
 
 int
-gtscmatch(pdp, match, auxp)
+gtscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct gvpbus_args *gap;
 
diff --git a/sys/arch/amiga/dev/gvpbus.c b/sys/arch/amiga/dev/gvpbus.c
index 926e9915234d..94ae2115eaca 100644
--- a/sys/arch/amiga/dev/gvpbus.c
+++ b/sys/arch/amiga/dev/gvpbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gvpbus.c,v 1.14 1996/10/13 03:07:11 christos Exp $	*/
+/*	$NetBSD: gvpbus.c,v 1.15 1996/12/23 09:10:12 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -37,7 +37,7 @@
 #include <amiga/dev/gvpbusvar.h>
 
 void gvpbusattach __P((struct device *, struct device *, void *));
-int gvpbusmatch __P((struct device *, void *, void *));
+int gvpbusmatch __P((struct device *, struct cfdata *, void *));
 int gvpbusprint __P((void *auxp, const char *));
 
 extern int sbic_no_dma;		/* Kludge for A1291 - mlh */
@@ -51,9 +51,10 @@ struct cfdriver gvpbus_cd = {
 };
 
 int
-gvpbusmatch(pdp, match, auxp)
+gvpbusmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/idesc.c b/sys/arch/amiga/dev/idesc.c
index cd9174ec55b5..c4db72cdf6ff 100644
--- a/sys/arch/amiga/dev/idesc.c
+++ b/sys/arch/amiga/dev/idesc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: idesc.c,v 1.28 1996/12/10 21:27:24 thorpej Exp $	*/
+/*	$NetBSD: idesc.c,v 1.29 1996/12/23 09:10:12 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -237,7 +237,7 @@ struct idec_softc
 int ide_scsicmd __P((struct scsi_xfer *));
 
 void idescattach __P((struct device *, struct device *, void *));
-int idescmatch __P((struct device *, void *, void *));
+int idescmatch __P((struct device *, struct cfdata *, void *));
 
 int  ideicmd __P((struct idec_softc *, int, void *, int, void *, int));
 int  idego __P((struct idec_softc *, struct scsi_xfer *));
@@ -325,9 +325,10 @@ int ide_debug = 0;
  * if we are an A4000 we are here.
  */
 int
-idescmatch(pdp, match, auxp)
+idescmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	char *mbusstr;
 
diff --git a/sys/arch/amiga/dev/if_ae.c b/sys/arch/amiga/dev/if_ae.c
index 0e1ea28015d0..f8146a2d7e8f 100644
--- a/sys/arch/amiga/dev/if_ae.c
+++ b/sys/arch/amiga/dev/if_ae.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ae.c,v 1.11 1996/10/13 03:07:13 christos Exp $	*/
+/*	$NetBSD: if_ae.c,v 1.12 1996/12/23 09:10:13 veego Exp $	*/
 
 /*
  * Copyright (c) 1995 Bernd Ernesti and Klaus Burkert. All rights reserved.
@@ -135,7 +135,7 @@ struct	ae_softc {
 int	aestd[] = { 0, 0x0370, 0x8000 };
 static u_int16_t	revision;
 
-int	aematch __P((struct device *, void *, void *));
+int	aematch __P((struct device *, struct cfdata *, void *));
 void	aeattach __P((struct device *, struct device *, void *));
 void	aewatchdog __P((struct ifnet *));
 void	aestop __P((struct ae_softc *));
@@ -164,9 +164,10 @@ struct cfdriver ae_cd = {
 };
 
 int
-aematch(parent, match, aux)
+aematch(parent, cfp, aux)
 	struct device *parent;
-	void *match, *aux;
+	struct cfdata *cfp;
+	void *aux;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/if_bah.c b/sys/arch/amiga/dev/if_bah.c
index 2b5c1ea64592..2d6e2a018514 100644
--- a/sys/arch/amiga/dev/if_bah.c
+++ b/sys/arch/amiga/dev/if_bah.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bah.c,v 1.24 1996/11/18 09:08:29 is Exp $ */
+/*	$NetBSD: if_bah.c,v 1.25 1996/12/23 09:10:15 veego Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Ignatios Souvatzis
@@ -175,7 +175,7 @@ struct bah_softc {
 #endif
 };
 
-int	bah_zbus_match __P((struct device *, void *, void *));
+int	bah_zbus_match __P((struct device *, struct cfdata *, void *));
 void	bah_zbus_attach __P((struct device *, struct device *, void *));
 void	bah_init __P((struct bah_softc *));
 void	bah_reset __P((struct bah_softc *));
@@ -202,9 +202,10 @@ struct cfdriver bah_cd = {
 };
 
 int
-bah_zbus_match(parent, match, aux)
+bah_zbus_match(parent, cfp, aux)
 	struct device *parent;
-	void *match, *aux;
+	struct cfdata *cfp;
+	void *aux;
 {
 	struct zbus_args *zap = aux;
 
diff --git a/sys/arch/amiga/dev/if_ed.c b/sys/arch/amiga/dev/if_ed.c
index 6fb992011978..1718c407dc20 100644
--- a/sys/arch/amiga/dev/if_ed.c
+++ b/sys/arch/amiga/dev/if_ed.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ed.c,v 1.23 1996/10/13 03:07:16 christos Exp $	*/
+/*	$NetBSD: if_ed.c,v 1.24 1996/12/23 09:10:16 veego Exp $	*/
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -95,7 +95,7 @@ struct ed_softc {
 	u_char	next_packet;	/* pointer to next unread RX packet */
 };
 
-int ed_zbus_match __P((struct device *, void *, void *));
+int ed_zbus_match __P((struct device *, struct cfdata *, void *));
 void ed_zbus_attach __P((struct device *, struct device *, void *));
 int edintr __P((void *));
 int ed_ioctl __P((struct ifnet *, u_long, caddr_t));
@@ -185,9 +185,10 @@ word_copy(a, b, len)
 }
 
 int
-ed_zbus_match(parent, match, aux)
+ed_zbus_match(parent, cfp, aux)
 	struct device *parent;
-	void *match, *aux;
+	struct cfdata *cfp;
+	void *aux;
 {
 	struct zbus_args *zap = aux;
 
diff --git a/sys/arch/amiga/dev/if_es.c b/sys/arch/amiga/dev/if_es.c
index bfa7cc6cf2a1..283782762770 100644
--- a/sys/arch/amiga/dev/if_es.c
+++ b/sys/arch/amiga/dev/if_es.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_es.c,v 1.15 1996/10/13 03:07:17 christos Exp $	*/
+/*	$NetBSD: if_es.c,v 1.16 1996/12/23 09:10:17 veego Exp $	*/
 
 /*
  * Copyright (c) 1995 Michael L. Hitch
@@ -122,7 +122,7 @@ void esinit __P((struct es_softc *));
 void esreset __P((struct es_softc *));
 void esstop __P((struct es_softc *));
 
-int esmatch __P((struct device *, void *, void *));
+int esmatch __P((struct device *, struct cfdata *, void *));
 void esattach __P((struct device *, struct device *, void *));
 
 struct cfattach es_ca = {
@@ -134,9 +134,10 @@ struct cfdriver es_cd = {
 };
 
 int
-esmatch(parent, match, aux)
+esmatch(parent, cfp, aux)
 	struct device *parent;
-	void *match, *aux;
+	struct cfdata *cfp;
+	void *aux;
 {
 	struct zbus_args *zap = aux;
 
diff --git a/sys/arch/amiga/dev/if_le.c b/sys/arch/amiga/dev/if_le.c
index f51be4c8bed5..8a56560f8a56 100644
--- a/sys/arch/amiga/dev/if_le.c
+++ b/sys/arch/amiga/dev/if_le.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.21 1996/05/07 00:35:07 thorpej Exp $	*/
+/*	$NetBSD: if_le.c,v 1.22 1996/12/23 09:10:18 veego Exp $	*/
 
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -70,7 +70,7 @@
 /* offsets for:	   ID,   REGS,    MEM */
 int	lestd[] = { 0, 0x4000, 0x8000 };
 
-int le_zbus_match __P((struct device *, void *, void *));
+int le_zbus_match __P((struct device *, struct cfdata *, void *));
 void le_zbus_attach __P((struct device *, struct device *, void *));
 
 struct cfattach le_zbus_ca = {
@@ -105,9 +105,10 @@ lerdcsr(sc, port)
 }
 
 int
-le_zbus_match(parent, match, aux)
+le_zbus_match(parent, cfp, aux)
 	struct device *parent;
-	void *match, *aux;
+	struct cfdata *cfp;
+	void *aux;
 {
 	struct zbus_args *zap = aux;
 
diff --git a/sys/arch/amiga/dev/if_qn.c b/sys/arch/amiga/dev/if_qn.c
index 4edfaae05c46..c4192297efbb 100644
--- a/sys/arch/amiga/dev/if_qn.c
+++ b/sys/arch/amiga/dev/if_qn.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_qn.c,v 1.9 1996/10/13 03:07:18 christos Exp $	*/
+/*	$NetBSD: if_qn.c,v 1.10 1996/12/23 09:10:19 veego Exp $	*/
 
 /*
  * Copyright (c) 1995 Mika Kortelainen
@@ -156,7 +156,7 @@ struct	qn_softc {
 #endif
 
 
-int	qnmatch __P((struct device *, void *, void *));
+int	qnmatch __P((struct device *, struct cfdata *, void *));
 void	qnattach __P((struct device *, struct device *, void *));
 int	qnintr __P((void *));
 int	qnioctl __P((struct ifnet *, u_long, caddr_t));
@@ -185,9 +185,10 @@ struct cfdriver qn_cd = {
 
 
 int
-qnmatch(parent, match, aux)
+qnmatch(parent, cfp, aux)
 	struct device *parent;
-	void *match, *aux;
+	struct cfdata *cfp;
+	void *aux;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/ite.c b/sys/arch/amiga/dev/ite.c
index 1fed5f0abe11..6bb0dfb4cfdb 100644
--- a/sys/arch/amiga/dev/ite.c
+++ b/sys/arch/amiga/dev/ite.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite.c,v 1.46 1996/10/13 03:07:19 christos Exp $	*/
+/*	$NetBSD: ite.c,v 1.47 1996/12/23 09:10:20 veego Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -119,7 +119,7 @@ static void ite_sifilter __P((void *, void *));
 void iteputchar __P((int c, struct ite_softc *ip));
 void ite_putstr __P((const char * s, int len, dev_t dev));
 void iteattach __P((struct device *, struct device *, void *));
-int itematch __P((struct device *, void *, void *));
+int itematch __P((struct device *, struct cfdata *, void *));
 static void iteprecheckwrap __P((struct ite_softc *));
 static void itecheckwrap __P((struct ite_softc *));
 struct ite_softc *getitesp __P((dev_t));
@@ -157,11 +157,11 @@ struct cfdriver ite_cd = {
 };
 
 int
-itematch(pdp, match, auxp)
+itematch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cdp = match;
 	struct grf_softc *gp;
 	int maj;
 	
@@ -170,7 +170,7 @@ itematch(pdp, match, auxp)
 	 * all that our mask allows (more than enough no one 
 	 * has > 32 monitors for text consoles on one machine)
 	 */
-	if (cdp->cf_unit >= sizeof(ite_confunits) * NBBY)
+	if (cfp->cf_unit >= sizeof(ite_confunits) * NBBY)
 		return(0);
 	/*
 	 * XXX
@@ -181,7 +181,7 @@ itematch(pdp, match, auxp)
 	for(maj = 0; maj < nchrdev; maj++)
 		if (cdevsw[maj].d_open == iteopen)
 			break;
-	gp->g_itedev = makedev(maj, cdp->cf_unit);
+	gp->g_itedev = makedev(maj, cfp->cf_unit);
 	return(1);
 }
 
diff --git a/sys/arch/amiga/dev/ivsc.c b/sys/arch/amiga/dev/ivsc.c
index a8d8159a1070..fc3df6f275a2 100644
--- a/sys/arch/amiga/dev/ivsc.c
+++ b/sys/arch/amiga/dev/ivsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ivsc.c,v 1.20 1996/12/10 21:27:25 thorpej Exp $	*/
+/*	$NetBSD: ivsc.c,v 1.21 1996/12/23 09:10:21 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -49,7 +49,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void ivscattach __P((struct device *, struct device *, void *));
-int ivscmatch __P((struct device *, void *, void *));
+int ivscmatch __P((struct device *, struct cfdata *, void *));
 
 int ivsc_intr __P((void *));
 int ivsc_dma_xfer_in __P((struct sci_softc *dev, int len,
@@ -95,9 +95,10 @@ struct cfdriver ivsc_cd = {
  * if this is an IVS board
  */
 int
-ivscmatch(pdp, match, auxp)
+ivscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/kbd.c b/sys/arch/amiga/dev/kbd.c
index 8a66cf87a033..1a063fa0a3fd 100644
--- a/sys/arch/amiga/dev/kbd.c
+++ b/sys/arch/amiga/dev/kbd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kbd.c,v 1.27 1996/11/30 01:30:37 is Exp $	*/
+/*	$NetBSD: kbd.c,v 1.28 1996/12/23 09:10:22 veego Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -71,7 +71,7 @@ struct kbd_softc {
 };
 struct kbd_softc kbd_softc;
 
-int kbdmatch __P((struct device *, void *, void *));
+int kbdmatch __P((struct device *, struct cfdata *, void *));
 void kbdattach __P((struct device *, struct device *, void *));
 void kbdintr __P((int));
 void kbdstuffchar __P((u_char));
@@ -86,9 +86,10 @@ struct cfdriver kbd_cd = {
 
 /*ARGSUSED*/
 int
-kbdmatch(pdp, match, auxp)
+kbdmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 
 	if (matchname((char *)auxp, "kbd"))
diff --git a/sys/arch/amiga/dev/mfc.c b/sys/arch/amiga/dev/mfc.c
index 10da676e58cb..fc3f58ab4747 100644
--- a/sys/arch/amiga/dev/mfc.c
+++ b/sys/arch/amiga/dev/mfc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mfc.c,v 1.17 1996/10/13 03:07:23 christos Exp $ */
+/*	$NetBSD: mfc.c,v 1.18 1996/12/23 09:10:23 veego Exp $ */
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -181,10 +181,10 @@ struct mfc_args {
 
 int	mfcprint __P((void *auxp, const char *));
 void	mfcattach __P((struct device *, struct device *, void *));
-int	mfcmatch __P((struct device *, void *, void *));
+int	mfcmatch __P((struct device *, struct cfdata *, void *));
 
 #if NMFCS > 0
-int	mfcsmatch __P((struct device *, void *, void *));
+int	mfcsmatch __P((struct device *, struct cfdata *, void *));
 void	mfcsattach __P((struct device *, struct device *, void *));
 int	mfcsparam __P(( struct tty *, struct termios *));
 int	mfcshwiflow __P((struct tty *, int));
@@ -197,7 +197,7 @@ void	mfcsmint __P((register int));
 
 #if NMFCP > 0
 void mfcpattach __P((struct device *, struct device *, void *));
-int mfcpmatch __P((struct device *, void *, void *));
+int mfcpmatch __P((struct device *, struct cfdata *, void *));
 #endif
 int mfcintr __P((void *));
 
@@ -320,9 +320,10 @@ struct speedtab mfcs2speedtab2[] = {
  * if we are an bsc/Alf Data MultFaceCard (I, II, and III)
  */
 int
-mfcmatch(pdp, match, auxp)
+mfcmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
@@ -401,9 +402,10 @@ mfcattach(pdp, dp, auxp)
  *
  */
 int
-mfcsmatch(pdp, match, auxp)
+mfcsmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct mfc_args *ma;
 
diff --git a/sys/arch/amiga/dev/mgnsc.c b/sys/arch/amiga/dev/mgnsc.c
index d13965daba27..1a2eb09dea93 100644
--- a/sys/arch/amiga/dev/mgnsc.c
+++ b/sys/arch/amiga/dev/mgnsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mgnsc.c,v 1.23 1996/12/10 21:27:26 thorpej Exp $	*/
+/*	$NetBSD: mgnsc.c,v 1.24 1996/12/23 09:10:24 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -51,7 +51,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void mgnscattach __P((struct device *, struct device *, void *));
-int mgnscmatch __P((struct device *, void *, void *));
+int mgnscmatch __P((struct device *, struct cfdata *, void *));
 int mgnsc_dmaintr __P((void *));
 #ifdef DEBUG
 void mgnsc_dump __P((void));
@@ -87,9 +87,10 @@ struct cfdriver mgnsc_cd = {
  * if we are a CSA Magnum 40 SCSI
  */
 int
-mgnscmatch(pdp, match, auxp)
+mgnscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/mlhsc.c b/sys/arch/amiga/dev/mlhsc.c
index 3a58b2c8a3f2..ab1111a71d8e 100644
--- a/sys/arch/amiga/dev/mlhsc.c
+++ b/sys/arch/amiga/dev/mlhsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mlhsc.c,v 1.15 1996/12/10 21:27:27 thorpej Exp $	*/
+/*	$NetBSD: mlhsc.c,v 1.16 1996/12/23 09:10:25 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -48,7 +48,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void mlhscattach __P((struct device *, struct device *, void *));
-int mlhscmatch __P((struct device *, void *, void *));
+int mlhscmatch __P((struct device *, struct cfdata *, void *));
 
 int mlhsc_dma_xfer_in __P((struct sci_softc *dev, int len,
     register u_char *buf, int phase));
@@ -90,9 +90,10 @@ struct cfdriver mlhsc_cd = {
  * if we are my Hacker's SCSI board we are here.
  */
 int
-mlhscmatch(pdp, match, auxp)
+mlhscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/ms.c b/sys/arch/amiga/dev/ms.c
index 49efd41224cb..47d75333a100 100644
--- a/sys/arch/amiga/dev/ms.c
+++ b/sys/arch/amiga/dev/ms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ms.c,v 1.13 1996/10/13 03:07:26 christos Exp $	*/
+/*	$NetBSD: ms.c,v 1.14 1996/12/23 09:10:25 veego Exp $	*/
 
 /*
  * based on:
@@ -73,7 +73,7 @@
 #include <machine/conf.h>
 
 void msattach __P((struct device *, struct device *, void *));
-int msmatch __P((struct device *, void *, void *));
+int msmatch __P((struct device *, struct cfdata *, void *));
 
 void msintr __P((void *));
 void ms_enable __P((dev_t));
@@ -101,11 +101,11 @@ struct cfdriver ms_cd = {
 };
 
 int
-msmatch(pdp, match, auxp)
+msmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cfp = (struct cfdata *)match;
 
 	if (matchname((char *)auxp, "ms") &&
 	    cfp->cf_unit >= 0 && cfp->cf_unit <= 1) /* only two units */
diff --git a/sys/arch/amiga/dev/msc.c b/sys/arch/amiga/dev/msc.c
index 9b9264e1c3ec..157ce3d06ff8 100644
--- a/sys/arch/amiga/dev/msc.c
+++ b/sys/arch/amiga/dev/msc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: msc.c,v 1.12 1996/12/20 19:21:11 veego Exp $	*/
+/*	$NetBSD: msc.c,v 1.13 1996/12/23 09:10:26 veego Exp $	*/
 
 /*
  * Copyright (c) 1993 Zik.
@@ -165,7 +165,7 @@ struct   speedtab *mscspeedtab;
 int mscmctl __P((dev_t dev, int bits, int howto));
 void mscmint __P((register void *data));
 
-int mscmatch __P((struct device *, void *, void *));
+int mscmatch __P((struct device *, struct cfdata *, void *));
 void mscattach __P((struct device *, struct device *, void *));
 
 #define	SWFLAGS(dev)	(msc->openflags | (MSCDIALIN(dev) ? 0 : TIOCFLAG_SOFTCAR))
@@ -181,9 +181,10 @@ struct cfdriver msc_cd = {
 
 
 int
-mscmatch(pdp, match, auxp)
+mscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/otgsc.c b/sys/arch/amiga/dev/otgsc.c
index 34b54bea5c3e..2e2fa74cbd1a 100644
--- a/sys/arch/amiga/dev/otgsc.c
+++ b/sys/arch/amiga/dev/otgsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: otgsc.c,v 1.16 1996/12/10 21:27:27 thorpej Exp $	*/
+/*	$NetBSD: otgsc.c,v 1.17 1996/12/23 09:10:27 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -48,7 +48,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void otgscattach __P((struct device *, struct device *, void *));
-int otgscmatch __P((struct device *, void *, void *));
+int otgscmatch __P((struct device *, struct cfdata *, void *));
 
 int otgsc_dma_xfer_in __P((struct sci_softc *dev, int len,
     register u_char *buf, int phase));
@@ -92,9 +92,10 @@ struct cfdriver otgsc_cd = {
  * if we are my Hacker's SCSI board we are here.
  */
 int
-otgscmatch(pdp, match, auxp)
+otgscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/par.c b/sys/arch/amiga/dev/par.c
index 913d0082648b..ea30dab7d022 100644
--- a/sys/arch/amiga/dev/par.c
+++ b/sys/arch/amiga/dev/par.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: par.c,v 1.15 1996/10/13 03:07:28 christos Exp $	*/
+/*	$NetBSD: par.c,v 1.16 1996/12/23 09:10:28 veego Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -99,7 +99,7 @@ void parstart __P((void *));
 void parintr __P((void *));
 
 void parattach __P((struct device *, struct device *, void *));
-int parmatch __P((struct device *, void *, void *));
+int parmatch __P((struct device *, struct cfdata *, void *));
 
 struct cfattach par_ca = {
 	sizeof(struct device), parmatch, parattach
@@ -111,11 +111,11 @@ struct cfdriver par_cd = {
 
 /*ARGSUSED*/
 int
-parmatch(pdp, match, auxp)
+parmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cfp = match;
 
 	if (matchname((char *)auxp, "par") && cfp->cf_unit == 0)
 		return(1);
diff --git a/sys/arch/amiga/dev/ser.c b/sys/arch/amiga/dev/ser.c
index 24641d213823..396b68a53956 100644
--- a/sys/arch/amiga/dev/ser.c
+++ b/sys/arch/amiga/dev/ser.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ser.c,v 1.38 1996/10/13 03:07:32 christos Exp $	*/
+/*	$NetBSD: ser.c,v 1.39 1996/12/23 09:10:29 veego Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -67,7 +67,7 @@
 #if NSER > 0
 
 void serattach __P((struct device *, struct device *, void *));
-int sermatch __P((struct device *, void *, void *));
+int sermatch __P((struct device *, struct cfdata *, void *));
 
 struct ser_softc {
 	struct device dev;
@@ -171,11 +171,11 @@ long	sermintcount[16];
 void	sermint __P((register int unit));
 
 int
-sermatch(pdp, match, auxp)
+sermatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cfp = match;
 
 	if (matchname("ser", (char *)auxp) == 0 || cfp->cf_unit != 0)
 		return(0);
diff --git a/sys/arch/amiga/dev/wesc.c b/sys/arch/amiga/dev/wesc.c
index d22627c65bd7..72d5b4627bad 100644
--- a/sys/arch/amiga/dev/wesc.c
+++ b/sys/arch/amiga/dev/wesc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wesc.c,v 1.18 1996/12/10 21:27:28 thorpej Exp $	*/
+/*	$NetBSD: wesc.c,v 1.19 1996/12/23 09:10:30 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -51,7 +51,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void wescattach __P((struct device *, struct device *, void *));
-int wescmatch __P((struct device *, void *, void *));
+int wescmatch __P((struct device *, struct cfdata *, void *));
 int wesc_dmaintr __P((void *));
 #ifdef DEBUG
 void wesc_dump __P((void));
@@ -87,9 +87,10 @@ struct cfdriver wesc_cd = {
  * if we are an MacroSystemsUS Warp Engine
  */
 int
-wescmatch(pdp, match, auxp)
+wescmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/wstsc.c b/sys/arch/amiga/dev/wstsc.c
index 78e9d8132b30..8c89e079d4ab 100644
--- a/sys/arch/amiga/dev/wstsc.c
+++ b/sys/arch/amiga/dev/wstsc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wstsc.c,v 1.17 1996/12/10 21:27:29 thorpej Exp $	*/
+/*	$NetBSD: wstsc.c,v 1.18 1996/12/23 09:10:31 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -48,7 +48,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void wstscattach __P((struct device *, struct device *, void *));
-int wstscmatch __P((struct device *, void *, void *));
+int wstscmatch __P((struct device *, struct cfdata *, void *));
 
 int wstsc_dma_xfer_in __P((struct sci_softc *dev, int len,
     register u_char *buf, int phase));
@@ -97,9 +97,10 @@ struct cfdriver wstsc_cd = {
  * if this a Supra WordSync board
  */
 int
-wstscmatch(pdp, match, auxp)
+wstscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/dev/zbus.c b/sys/arch/amiga/dev/zbus.c
index b21a73d04108..f84a7fc535ef 100644
--- a/sys/arch/amiga/dev/zbus.c
+++ b/sys/arch/amiga/dev/zbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: zbus.c,v 1.28 1996/12/09 18:17:40 is Exp $	*/
+/*	$NetBSD: zbus.c,v 1.29 1996/12/23 09:10:32 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -179,7 +179,7 @@ static int npreconfent = sizeof(preconftab) / sizeof(struct preconfdata);
 
 void zbusattach __P((struct device *, struct device *, void *));
 int zbusprint __P((void *, const char *));
-int zbusmatch __P((struct device *, void *, void *));
+int zbusmatch __P((struct device *, struct cfdata *, void *));
 caddr_t zbusmap __P((caddr_t, u_int));
 static char *aconflookup __P((int, int));
 
@@ -216,11 +216,11 @@ static struct cfdata *early_cfdata;
 
 /*ARGSUSED*/
 int
-zbusmatch(pdp, match, auxp)
+zbusmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
-	struct cfdata *cfp = match;
 
 	if (matchname(auxp, "zbus") == 0)
 		return(0);
diff --git a/sys/arch/amiga/dev/zssc.c b/sys/arch/amiga/dev/zssc.c
index 7d1838573a19..dab5dd337e81 100644
--- a/sys/arch/amiga/dev/zssc.c
+++ b/sys/arch/amiga/dev/zssc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: zssc.c,v 1.21 1996/12/10 21:27:30 thorpej Exp $	*/
+/*	$NetBSD: zssc.c,v 1.22 1996/12/23 09:10:33 veego Exp $	*/
 
 /*
  * Copyright (c) 1994 Michael L. Hitch
@@ -51,7 +51,7 @@
 #include <amiga/dev/zbusvar.h>
 
 void zsscattach __P((struct device *, struct device *, void *));
-int  zsscmatch __P((struct device *, void *, void *));
+int  zsscmatch __P((struct device *, struct cfdata *, void *));
 int  zssc_dmaintr __P((void *));
 #ifdef DEBUG
 void zssc_dump __P((void));
@@ -87,9 +87,10 @@ struct cfdriver zssc_cd = {
  * if we are an PPI Zeus
  */
 int
-zsscmatch(pdp, match, auxp)
+zsscmatch(pdp, cfp, auxp)
 	struct device *pdp;
-	void *match, *auxp;
+	struct cfdata *cfp;
+	void *auxp;
 {
 	struct zbus_args *zap;
 
diff --git a/sys/arch/amiga/include/types.h b/sys/arch/amiga/include/types.h
index 3b4b59f645aa..8d871f49a554 100644
--- a/sys/arch/amiga/include/types.h
+++ b/sys/arch/amiga/include/types.h
@@ -1,10 +1,8 @@
-/*	$NetBSD: types.h,v 1.10 1996/12/05 00:13:48 cgd Exp $	*/
+/*	$NetBSD: types.h,v 1.11 1996/12/23 09:16:20 veego Exp $	*/
 
 #ifndef _MACHINE_TYPES_H_
 #define _MACHINE_TYPES_H_
 
 #include <m68k/types.h>
 
-#define	__BROKEN_INDIRECT_CONFIG
-
 #endif