From ea3a1d9c44f8f544eced53202c2968a415bd4ccf Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Mon, 8 Jun 1998 06:55:54 +0000
Subject: [PATCH] Nuke __BROKEN_INDIRECT_CONFIG.

---
 sys/dev/eisa/ahb.c        | 10 +---------
 sys/dev/eisa/ahc_eisa.c   | 10 +---------
 sys/dev/eisa/bha_eisa.c   | 10 +---------
 sys/dev/eisa/eisa.c       | 32 +-------------------------------
 sys/dev/eisa/if_ep_eisa.c | 10 +---------
 sys/dev/eisa/if_fea.c     |  6 +-----
 sys/dev/eisa/uha_eisa.c   | 10 +---------
 sys/dev/pci/ahc_pci.c     | 10 +---------
 sys/dev/pci/bha_pci.c     | 10 +---------
 sys/dev/pci/cy_pci.c      | 10 +---------
 sys/dev/pci/eap.c         | 10 +---------
 sys/dev/pci/i82365_pci.c  | 10 +---------
 sys/dev/pci/if_de.c       |  6 +-----
 sys/dev/pci/if_en_pci.c   | 10 +---------
 sys/dev/pci/if_ep_pci.c   | 10 +---------
 sys/dev/pci/if_epic_pci.c | 10 +---------
 sys/dev/pci/if_esh_pci.c  | 10 +---------
 sys/dev/pci/if_fpa.c      |  6 +-----
 sys/dev/pci/if_fxp.c      | 10 +---------
 sys/dev/pci/if_le_pci.c   | 10 +---------
 sys/dev/pci/if_ne_pci.c   | 10 +---------
 sys/dev/pci/if_tl.c       | 10 +---------
 sys/dev/pci/isp_pci.c     | 10 +---------
 sys/dev/pci/ncr.c         | 12 ++----------
 sys/dev/pci/pciide.c      | 10 +---------
 sys/dev/pci/ppb.c         | 10 +---------
 sys/dev/pci/vga_pci.c     | 10 +---------
 sys/dev/pci/wdc_pciide.c  | 17 +----------------
 28 files changed, 29 insertions(+), 270 deletions(-)

diff --git a/sys/dev/eisa/ahb.c b/sys/dev/eisa/ahb.c
index 4284d4bd12cd..f1e46144e9ae 100644
--- a/sys/dev/eisa/ahb.c
+++ b/sys/dev/eisa/ahb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahb.c,v 1.18 1998/02/17 03:02:30 thorpej Exp $	*/
+/*	$NetBSD: ahb.c,v 1.19 1998/06/08 07:04:46 thorpej Exp $	*/
 
 #undef	AHBDEBUG
 #ifdef DDB
@@ -189,11 +189,7 @@ struct scsipi_device ahb_dev = {
 	NULL,			/* Use default 'done' routine */
 };
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	ahbmatch __P((struct device *, void *, void *));
-#else
 int	ahbmatch __P((struct device *, struct cfdata *, void *));
-#endif
 void	ahbattach __P((struct device *, struct device *, void *));
 
 struct cfattach ahb_ca = {
@@ -210,11 +206,7 @@ struct cfattach ahb_ca = {
 int
 ahbmatch(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct eisa_attach_args *ea = aux;
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index 05f777e5c9ca..01449f0814c4 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahc_eisa.c,v 1.15 1998/03/17 21:30:38 thorpej Exp $	*/
+/*	$NetBSD: ahc_eisa.c,v 1.16 1998/06/08 07:04:46 thorpej Exp $	*/
 
 /*
  * Product specific probe and attach routines for:
@@ -201,11 +201,7 @@ aic7770probe(void)
 #endif
 
 int	ahc_eisa_irq __P((bus_space_tag_t, bus_space_handle_t));
-#ifdef	__BROKEN_INDIRECT_CONFIG
-int	ahc_eisa_match __P((struct device *, void *, void *));
-#else
 int	ahc_eisa_match __P((struct device *, struct cfdata *, void *));
-#endif
 void	ahc_eisa_attach __P((struct device *, struct device *, void *));
 
 
@@ -251,11 +247,7 @@ ahc_eisa_irq(iot, ioh)
 int
 ahc_eisa_match(parent, match, aux)
 	struct device *parent;
-#ifdef	__BROKEN_INDIRECT_CONFIG
-        void *match;
-#else
         struct cfdata *match;
-#endif
         void *aux; 
 {
 	struct eisa_attach_args *ea = aux;
diff --git a/sys/dev/eisa/bha_eisa.c b/sys/dev/eisa/bha_eisa.c
index 3c132036a5a7..d064f58170bd 100644
--- a/sys/dev/eisa/bha_eisa.c
+++ b/sys/dev/eisa/bha_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bha_eisa.c,v 1.11 1998/01/09 21:16:36 mycroft Exp $	*/
+/*	$NetBSD: bha_eisa.c,v 1.12 1998/06/08 07:04:46 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1996, 1997, 1998 Charles M. Hannum.  All rights reserved.
@@ -51,11 +51,7 @@
 #define	BHA_ISA_IOSIZE	4
 
 int	bha_eisa_address __P((bus_space_tag_t, bus_space_handle_t, int *));
-#ifdef  __BROKEN_INDIRECT_CONFIG
-int	bha_eisa_match __P((struct device *, void *, void *));
-#else
 int	bha_eisa_match __P((struct device *, struct cfdata *, void *));
-#endif
 void	bha_eisa_attach __P((struct device *, struct device *, void *));
 
 struct cfattach bha_eisa_ca = {
@@ -105,11 +101,7 @@ bha_eisa_address(iot, ioh, portp)
 int
 bha_eisa_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct eisa_attach_args *ea = aux;
diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c
index 420d53b7a4ed..1902d15c5ba0 100644
--- a/sys/dev/eisa/eisa.c
+++ b/sys/dev/eisa/eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: eisa.c,v 1.20 1998/01/12 08:57:23 thorpej Exp $	*/
+/*	$NetBSD: eisa.c,v 1.21 1998/06/08 07:04:46 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -50,42 +50,23 @@
 #include <dev/eisa/eisavar.h>
 #include <dev/eisa/eisadevs.h>
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	eisamatch __P((struct device *, void *, void *));
-#else
 int	eisamatch __P((struct device *, struct cfdata *, void *));
-#endif
 void	eisaattach __P((struct device *, struct device *, void *));
 
 struct cfattach eisa_ca = {
 	sizeof(struct device), eisamatch, eisaattach
 };
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	eisasubmatch __P((struct device *, void *, void *));
-#else
 int	eisasubmatch __P((struct device *, struct cfdata *, void *));
-#endif
 int	eisaprint __P((void *, const char *));
 void	eisa_devinfo __P((const char *, char *));
 
 int
-#ifdef __BROKEN_INDIRECT_CONFIG
-eisamatch(parent, match, aux)
-#else
 eisamatch(parent, cf, aux)
-#endif
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *cf;
-#endif
 	void *aux;
 {
-#ifdef __BROKEN_INDIRECT_CONFIG
-	struct cfdata *cf = match;
-#endif
 	struct eisabus_attach_args *eba = aux;
 
 	if (strcmp(eba->eba_busname, cf->cf_driver->cd_name))
@@ -113,22 +94,11 @@ eisaprint(aux, pnp)
 }
 
 int
-#ifdef __BROKEN_INDIRECT_CONFIG
-eisasubmatch(parent, match, aux)
-#else
 eisasubmatch(parent, cf, aux)
-#endif
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *cf;
-#endif
 	void *aux;
 {
-#ifdef __BROKEN_INDIRECT_CONFIG
-	struct cfdata *cf = match;
-#endif
 	struct eisa_attach_args *ea = aux;
 
 	if (cf->eisacf_slot != EISA_UNKNOWN_SLOT &&
diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c
index 271fde2dd49b..63899494a2df 100644
--- a/sys/dev/eisa/if_ep_eisa.c
+++ b/sys/dev/eisa/if_ep_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ep_eisa.c,v 1.14 1997/10/14 21:30:59 thorpej Exp $	*/
+/*	$NetBSD: if_ep_eisa.c,v 1.15 1998/06/08 07:04:46 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Jonathan Stone <jonathan@NetBSD.org>
@@ -77,11 +77,7 @@
 #include <dev/eisa/eisavar.h>
 #include <dev/eisa/eisadevs.h>
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int ep_eisa_match __P((struct device *, void *, void *));
-#else
 int ep_eisa_match __P((struct device *, struct cfdata *, void *));
-#endif
 void ep_eisa_attach __P((struct device *, struct device *, void *));
 
 struct cfattach ep_eisa_ca = {
@@ -97,11 +93,7 @@ struct cfattach ep_eisa_ca = {
 int
 ep_eisa_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct eisa_attach_args *ea = aux;
diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c
index bdbecf1f2bd5..8a414074eb28 100644
--- a/sys/dev/eisa/if_fea.c
+++ b/sys/dev/eisa/if_fea.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fea.c,v 1.17 1998/05/21 20:44:03 matt Exp $	*/
+/*	$NetBSD: if_fea.c,v 1.18 1998/06/08 07:04:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -446,11 +446,7 @@ struct cfdriver feacd = {
 static int
 pdq_eisa_match(
     struct device *parent,
-#ifdef __BROKEN_INDIRECT_CONFIG
-    void *match,
-#else
     struct cfdata *match,
-#endif
     void *aux)
 {
     const struct eisa_attach_args * const ea = (struct eisa_attach_args *) aux;
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index da3e301ef09f..10b63e202221 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uha_eisa.c,v 1.10 1998/02/17 03:02:56 thorpej Exp $	*/
+/*	$NetBSD: uha_eisa.c,v 1.11 1998/06/08 07:04:47 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1996, 1997 Charles M. Hannum.  All rights reserved.
@@ -53,11 +53,7 @@
 #define	UHA_EISA_SLOT_OFFSET	0xc80
 #define	UHA_EISA_IOSIZE		0x020
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	uha_eisa_match __P((struct device *, void *, void *));
-#else
 int	uha_eisa_match __P((struct device *, struct cfdata *, void *));
-#endif
 void	uha_eisa_attach __P((struct device *, struct device *, void *));
 
 struct cfattach uha_eisa_ca = {
@@ -83,11 +79,7 @@ void	u24_init __P((struct uha_softc *));
 int
 uha_eisa_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct eisa_attach_args *ea = aux;
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c
index 64ab13156dac..2b1ca827e16d 100644
--- a/sys/dev/pci/ahc_pci.c
+++ b/sys/dev/pci/ahc_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahc_pci.c,v 1.17 1998/03/16 15:39:13 leo Exp $	*/
+/*	$NetBSD: ahc_pci.c,v 1.18 1998/06/08 06:55:54 thorpej Exp $	*/
 
 /*
  * Product specific probe and attach routines for:
@@ -259,11 +259,7 @@ aic7870_probe (pcici_t tag, pcidi_t type)
 
 #elif defined(__NetBSD__)
 
-#ifdef	__BROKEN_INDIRECT_CONFIG
-int ahc_pci_probe __P((struct device *, void *, void *));
-#else
 int ahc_pci_probe __P((struct device *, struct cfdata *, void *));
-#endif
 void ahc_pci_attach __P((struct device *, struct device *, void *));
 
 struct cfattach ahc_pci_ca = {
@@ -273,11 +269,7 @@ struct cfattach ahc_pci_ca = {
 int
 ahc_pci_probe(parent, match, aux)
         struct device *parent;
-#ifdef	__BROKEN_INDIRECT_CONFIG
-        void *match;
-#else
         struct cfdata *match;
-#endif
         void *aux; 
 {       
         struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c
index a23752dc32b3..94b069febdf8 100644
--- a/sys/dev/pci/bha_pci.c
+++ b/sys/dev/pci/bha_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bha_pci.c,v 1.14 1997/08/27 11:25:22 bouyer Exp $	*/
+/*	$NetBSD: bha_pci.c,v 1.15 1998/06/08 06:55:54 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1996, 1997 Charles M. Hannum.  All rights reserved.
@@ -49,11 +49,7 @@
 
 #define	PCI_CBIO	0x10
 
-#ifdef	__BROKEN_INDIRECT_CONFIG
-int	bha_pci_match __P((struct device *, void *, void *));
-#else
 int	bha_pci_match __P((struct device *, struct cfdata *, void *));
-#endif
 void	bha_pci_attach __P((struct device *, struct device *, void *));
 
 struct cfattach bha_pci_ca = {
@@ -68,11 +64,7 @@ struct cfattach bha_pci_ca = {
 int
 bha_pci_match(parent, match, aux)
 	struct device *parent;
-#ifdef	__BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/cy_pci.c b/sys/dev/pci/cy_pci.c
index 4e4047022865..d06ee1b88390 100644
--- a/sys/dev/pci/cy_pci.c
+++ b/sys/dev/pci/cy_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cy_pci.c,v 1.7 1997/06/17 05:44:22 cgd Exp $	*/
+/*	$NetBSD: cy_pci.c,v 1.8 1998/06/08 06:55:54 thorpej Exp $	*/
 
 /*
  * cy_pci.c
@@ -24,11 +24,7 @@
 #include <dev/ic/cyreg.h>
 #include <dev/ic/cyvar.h>
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-static int cy_match_pci __P((struct device *, void *, void *));
-#else
 static int cy_match_pci __P((struct device *, struct cfdata *, void *));
-#endif
 static void cy_attach_pci  __P((struct device *, struct device *, void *));
 static int cy_map_pci __P((struct pci_attach_args *, bus_space_tag_t *,
     bus_space_handle_t *, bus_size_t  *, bus_space_tag_t *,
@@ -87,11 +83,7 @@ cy_unmap_pci(iot, ioh, iosize, memt, memh, memsize)
 static int
 cy_match_pci(parent, match, aux)
 	struct device	*parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void		*match;
-#else
 	struct cfdata	*match;
-#endif
 	void		*aux;
 {
 	struct pci_attach_args *pap = aux;
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index 644651a4750c..a64262a1542e 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: eap.c,v 1.6 1998/05/26 13:28:03 augustss Exp $	*/
+/*	$NetBSD: eap.c,v 1.7 1998/06/08 06:55:54 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -244,11 +244,7 @@ int	eapdebug = 0;
 #define DPRINTFN(n,x)
 #endif
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	eap_match __P((struct device *, void *, void *));
-#else
 int	eap_match __P((struct device *, struct cfdata *, void *));
-#endif
 void	eap_attach __P((struct device *, struct device *, void *));
 int	eap_intr __P((void *));
 
@@ -357,11 +353,7 @@ struct audio_device eap_device = {
 int
 eap_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = (struct pci_attach_args *) aux;
diff --git a/sys/dev/pci/i82365_pci.c b/sys/dev/pci/i82365_pci.c
index d16c231fdeeb..1594611b02b0 100644
--- a/sys/dev/pci/i82365_pci.c
+++ b/sys/dev/pci/i82365_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: i82365_pci.c,v 1.3 1998/05/23 18:32:30 matt Exp $	*/
+/*	$NetBSD: i82365_pci.c,v 1.4 1998/06/08 06:55:54 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -47,11 +47,7 @@
  */
 #define	PCI_CBIO		0x10	/* Configuration Base IO Address */
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	pcic_pci_match __P((struct device *, void *, void *));
-#else
 int	pcic_pci_match __P((struct device *, struct cfdata *, void *));
-#endif
 void	pcic_pci_attach __P((struct device *, struct device *, void *));
 
 void	*pcic_pci_chip_intr_establish __P((pcmcia_chipset_handle_t,
@@ -83,11 +79,7 @@ static struct pcmcia_chip_functions pcic_pci_functions = {
 int
 pcic_pci_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata  *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = (struct pci_attach_args *) aux;
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 1377015977c7..a8d8ea83ee02 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_de.c,v 1.68 1998/05/25 22:20:24 mark Exp $	*/
+/*	$NetBSD: if_de.c,v 1.69 1998/06/08 06:55:55 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -5386,11 +5386,7 @@ struct cfdriver decd = {
 static int
 tulip_pci_probe(
     struct device *parent,
-#ifdef __BROKEN_INDIRECT_CONFIG
-    void *match,
-#else
     struct cfdata *match,
-#endif
     void *aux)
 {
     struct pci_attach_args *pa = (struct pci_attach_args *) aux;
diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c
index da47f78c2fcc..0b60c8c394fc 100644
--- a/sys/dev/pci/if_en_pci.c
+++ b/sys/dev/pci/if_en_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_en_pci.c,v 1.9 1997/04/13 20:14:28 cgd Exp $	*/
+/*	$NetBSD: if_en_pci.c,v 1.10 1998/06/08 06:55:55 thorpej Exp $	*/
 
 /*
  *
@@ -109,11 +109,7 @@ struct en_pci_softc {
  * prototypes
  */
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-static	int en_pci_match __P((struct device *, void *, void *));
-#else
 static	int en_pci_match __P((struct device *, struct cfdata *, void *));
-#endif
 static	void en_pci_attach __P((struct device *, struct device *, void *));
 
 /*
@@ -162,11 +158,7 @@ void *v;
 static int en_pci_match(parent, match, aux)
 
 struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-void *match;
-#else
 struct cfdata *match;
-#endif
 void *aux;
 
 {
diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c
index b6b02ce53045..d47b87ceae03 100644
--- a/sys/dev/pci/if_ep_pci.c
+++ b/sys/dev/pci/if_ep_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ep_pci.c,v 1.24 1997/10/14 21:37:00 thorpej Exp $	*/
+/*	$NetBSD: if_ep_pci.c,v 1.25 1998/06/08 06:55:55 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Jonathan Stone <jonathan@NetBSD.org>
@@ -84,11 +84,7 @@
 #define PCI_CONN		0x48    /* Connector type */
 #define PCI_CBIO		0x10    /* Configuration Base IO Address */
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int ep_pci_match __P((struct device *, void *, void *));
-#else
 int ep_pci_match __P((struct device *, struct cfdata *, void *));
-#endif
 void ep_pci_attach __P((struct device *, struct device *, void *));
 
 struct cfattach ep_pci_ca = {
@@ -98,11 +94,7 @@ struct cfattach ep_pci_ca = {
 int
 ep_pci_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = (struct pci_attach_args *) aux;
diff --git a/sys/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c
index 3e88e1b970c5..5f37cc5756cc 100644
--- a/sys/dev/pci/if_epic_pci.c
+++ b/sys/dev/pci/if_epic_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_epic_pci.c,v 1.1 1998/06/02 01:29:41 thorpej Exp $	*/
+/*	$NetBSD: if_epic_pci.c,v 1.2 1998/06/08 06:55:55 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -96,11 +96,7 @@ struct epic_pci_softc {
 	void	*sc_ih;			/* interrupt handle */
 };
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	epic_pci_match __P((struct device *, void *, void *));
-#else
 int	epic_pci_match __P((struct device *, struct cfdata *, void *));
-#endif
 void	epic_pci_attach __P((struct device *, struct device *, void *));
 
 struct cfattach epic_pci_ca = {
@@ -110,11 +106,7 @@ struct cfattach epic_pci_ca = {
 int
 epic_pci_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_esh_pci.c b/sys/dev/pci/if_esh_pci.c
index 4bee47db8ae8..779ed35ddbf7 100644
--- a/sys/dev/pci/if_esh_pci.c
+++ b/sys/dev/pci/if_esh_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_esh_pci.c,v 1.2 1998/05/17 16:46:28 kml Exp $	*/
+/*	$NetBSD: if_esh_pci.c,v 1.3 1998/06/08 06:55:55 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -97,11 +97,7 @@
 
 #define MEM_MAP_REG	0x10
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int esh_pci_match __P((struct device *, void *, void *));
-#else
 int esh_pci_match __P((struct device *, struct cfdata *, void *));
-#endif
 void esh_pci_attach __P((struct device *, struct device *, void *));
 static u_int8_t esh_pci_bist_read __P((struct esh_softc *));
 static void esh_pci_bist_write __P((struct esh_softc *, u_int8_t));
@@ -114,11 +110,7 @@ struct cfattach esh_pci_ca = {
 int
 esh_pci_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = (struct pci_attach_args *) aux;
diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c
index c62dafc0b804..8828fb0cf1e4 100644
--- a/sys/dev/pci/if_fpa.c
+++ b/sys/dev/pci/if_fpa.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fpa.c,v 1.25 1998/05/21 20:44:03 matt Exp $	*/
+/*	$NetBSD: if_fpa.c,v 1.26 1998/06/08 06:55:56 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -395,11 +395,7 @@ struct cfdriver fpacd = {
 static int
 pdq_pci_match(
     struct device *parent,
-#ifdef __BROKEN_INDIRECT_CONFIG
-    void *match,
-#else
     struct cfdata *match,
-#endif
     void *aux)
 {
     struct pci_attach_args *pa = (struct pci_attach_args *) aux;
diff --git a/sys/dev/pci/if_fxp.c b/sys/dev/pci/if_fxp.c
index 1842b2bbd8c4..0e9c9b4adef1 100644
--- a/sys/dev/pci/if_fxp.c
+++ b/sys/dev/pci/if_fxp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fxp.c,v 1.15 1998/05/18 17:14:32 cgd Exp $	*/
+/*	$NetBSD: if_fxp.c,v 1.16 1998/06/08 06:55:56 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -253,11 +253,7 @@ fxp_scb_wait(sc)
 	while (CSR_READ_1(sc, FXP_CSR_SCB_COMMAND) && --i);
 }
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-static int fxp_match __P((struct device *, void *, void *));
-#else
 static int fxp_match __P((struct device *, struct cfdata *, void *));
-#endif
 static void fxp_attach __P((struct device *, struct device *, void *));
 
 static void	fxp_shutdown __P((void *));
@@ -272,11 +268,7 @@ struct cfattach fxp_ca = {
 static int
 fxp_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index 6011252db455..fd55da354ee5 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_pci.c,v 1.20 1998/02/04 00:38:51 thorpej Exp $	*/
+/*	$NetBSD: if_le_pci.c,v 1.21 1998/06/08 06:55:56 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -113,11 +113,7 @@
 
 #include <dev/pci/if_levar.h>
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int le_pci_match __P((struct device *, void *, void *));
-#else
 int le_pci_match __P((struct device *, struct cfdata *, void *));
-#endif
 void le_pci_attach __P((struct device *, struct device *, void *));
 
 struct cfattach le_pci_ca = {
@@ -166,11 +162,7 @@ le_pci_rdcsr(sc, port)
 int
 le_pci_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c
index 63189ef0ada8..d8db8093d640 100644
--- a/sys/dev/pci/if_ne_pci.c
+++ b/sys/dev/pci/if_ne_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ne_pci.c,v 1.6 1998/05/05 17:23:08 thorpej Exp $	*/
+/*	$NetBSD: if_ne_pci.c,v 1.7 1998/06/08 06:55:56 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -75,11 +75,7 @@ struct ne_pci_softc {
 	void *sc_ih;				/* interrupt handle */
 };
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int ne_pci_match __P((struct device *, void *, void *));
-#else
 int ne_pci_match __P((struct device *, struct cfdata *, void *));
-#endif
 void ne_pci_attach __P((struct device *, struct device *, void *));
 
 struct cfattach ne_pci_ca = {
@@ -132,11 +128,7 @@ ne_pci_lookup(id)
 int
 ne_pci_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 25b795c06f39..322c3bd8da70 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tl.c,v 1.10 1998/05/05 07:17:12 thorpej Exp $	*/
+/*	$NetBSD: if_tl.c,v 1.11 1998/06/08 06:55:56 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
@@ -164,11 +164,7 @@ typedef u_long ioctl_cmd_t;
 	bus_space_write_1(sc->tl_bustag, sc->tl_bushandle, (reg), (data))
 #define ETHER_MIN_TX (ETHERMIN + sizeof(struct ether_header))
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-static int tl_pci_match __P((struct device *, void *, void *));
-#else
 static int tl_pci_match __P((struct device *, struct cfdata *, void *));
-#endif
 static void tl_pci_attach __P((struct device *, struct device *, void *));
 static int tl_intr __P((void *));
 
@@ -317,11 +313,7 @@ static char *nullbuf = NULL;
 static int
 tl_pci_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = (struct pci_attach_args *) aux;
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 32413e3d5ce1..af5f0f596c77 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isp_pci.c,v 1.19 1998/02/04 05:14:56 thorpej Exp $	*/
+/*	$NetBSD: isp_pci.c,v 1.20 1998/06/08 06:55:57 thorpej Exp $	*/
 
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
@@ -111,11 +111,7 @@ static struct ispmdvec mdvec_2100 = {
 #define MEM_MAP_REG	0x14
 
 
-#ifdef	__BROKEN_INDIRECT_CONFIG
-static int isp_pci_probe __P((struct device *, void *, void *));
-#else
 static int isp_pci_probe __P((struct device *, struct cfdata *, void *));
-#endif
 static void isp_pci_attach __P((struct device *, struct device *, void *));
 
 struct isp_pcisoftc {
@@ -139,12 +135,8 @@ struct cfattach isp_pci_ca = {
 static int
 isp_pci_probe(parent, match, aux)
         struct device *parent;
-#ifdef	__BROKEN_INDIRECT_CONFIG
-        void *match, *aux; 
-#else
         struct cfdata *match;
 	void *aux; 
-#endif
 {       
         struct pci_attach_args *pa = aux;
 
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index 1ffb8818672e..e4237539c8e5 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr.c,v 1.66 1998/05/28 13:51:09 matt Exp $	*/
+/*	$NetBSD: ncr.c,v 1.67 1998/06/08 06:55:57 thorpej Exp $	*/
 
 /**************************************************************************
 **
@@ -1413,11 +1413,7 @@ static	void	ncr_usercmd	(ncb_p np);
 static  void    ncr_wakeup      (ncb_p np, u_long code);
 
 #ifdef __NetBSD__
-#ifdef __BROKEN_INDIRECT_CONFIG
-static	int	ncr_probe	(struct device *, void *, void *);
-#else
 static	int	ncr_probe	(struct device *, struct cfdata *, void *);
-#endif
 static	void	ncr_attach	(struct device *, struct device *, void *);
 #else /* !__NetBSD__ */
 static  char*	ncr_probe       (pcici_t tag, pcidi_t type);
@@ -1438,7 +1434,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if 0
 static char ident[] =
-	"\n$NetBSD: ncr.c,v 1.66 1998/05/28 13:51:09 matt Exp $\n";
+	"\n$NetBSD: ncr.c,v 1.67 1998/06/08 06:55:57 thorpej Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
@@ -3512,11 +3508,7 @@ static int ncr_chip_lookup(u_long device_id, u_char revision_id)
 int
 ncr_probe(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 7635775b8a95..9ceb1501fe61 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide.c,v 1.6 1998/03/12 23:34:29 cgd Exp $	*/
+/*	$NetBSD: pciide.c,v 1.7 1998/06/08 06:55:57 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996, 1998 Christopher G. Demetriou.  All rights reserved.
@@ -83,11 +83,7 @@ struct pciide_softc {
 
 #define	PCIIDE_CHANNEL_NAME(chan)	((chan) == 0 ? "primary" : "secondary")
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	pciide_match __P((struct device *, void *, void *));
-#else
 int	pciide_match __P((struct device *, struct cfdata *, void *));
-#endif
 void	pciide_attach __P((struct device *, struct device *, void *));
 
 struct cfattach pciide_ca = {
@@ -111,11 +107,7 @@ int	pciide_pci_intr __P((void *));
 int
 pciide_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c
index f7cbf2f4d739..9552db2dc05d 100644
--- a/sys/dev/pci/ppb.c
+++ b/sys/dev/pci/ppb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ppb.c,v 1.17 1998/03/04 06:31:46 cgd Exp $	*/
+/*	$NetBSD: ppb.c,v 1.18 1998/06/08 06:55:57 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996, 1998 Christopher G. Demetriou.  All rights reserved.
@@ -39,11 +39,7 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/ppbreg.h>
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	ppbmatch __P((struct device *, void *, void *));
-#else
 int	ppbmatch __P((struct device *, struct cfdata *, void *));
-#endif
 void	ppbattach __P((struct device *, struct device *, void *));
 
 struct cfattach ppb_ca = {
@@ -55,11 +51,7 @@ int	ppbprint __P((void *, const char *pnp));
 int
 ppbmatch(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 85ac48623621..bcada7ce7ff5 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_pci.c,v 1.2 1998/05/28 16:48:41 drochner Exp $ */
+/* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -55,11 +55,7 @@ struct vga_pci_softc {
 #endif
 };
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	vga_pci_match __P((struct device *, void *, void *));
-#else
 int	vga_pci_match __P((struct device *, struct cfdata *, void *));
-#endif
 void	vga_pci_attach __P((struct device *, struct device *, void *));
 
 struct cfattach vga_pci_ca = {
@@ -69,11 +65,7 @@ struct cfattach vga_pci_ca = {
 int
 vga_pci_match(parent, match, aux)
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *match;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
 	struct pci_attach_args *pa = aux;
diff --git a/sys/dev/pci/wdc_pciide.c b/sys/dev/pci/wdc_pciide.c
index 7a964d7e9a32..71f17dd346ab 100644
--- a/sys/dev/pci/wdc_pciide.c
+++ b/sys/dev/pci/wdc_pciide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_pciide.c,v 1.1 1998/03/04 06:35:12 cgd Exp $	*/
+/*	$NetBSD: wdc_pciide.c,v 1.2 1998/06/08 06:55:58 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
@@ -56,11 +56,7 @@ struct wdc_pciide_softc {
 	struct wdc_attachment_data	sc_ad;
 };
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int	wdc_pciide_probe __P((struct device *, void *, void *));
-#else
 int	wdc_pciide_probe __P((struct device *, struct cfdata *, void *));
-#endif
 void	wdc_pciide_attach __P((struct device *, struct device *, void *));
 
 struct cfattach wdc_pciide_ca = {
@@ -68,22 +64,11 @@ struct cfattach wdc_pciide_ca = {
 };
 
 int
-#ifdef __BROKEN_INDIRECT_CONFIG
-wdc_pciide_probe(parent, matchv, aux)
-#else
 wdc_pciide_probe(parent, match, aux)
-#endif
 	struct device *parent;
-#ifdef __BROKEN_INDIRECT_CONFIG
-	void *matchv;
-#else
 	struct cfdata *match;
-#endif
 	void *aux;
 {
-#ifdef __BROKEN_INDIRECT_CONFIG
-	struct cfdata *match = matchv;
-#endif
 	struct pciide_attach_args *aa = aux;
 
 	/*