[src/trunk]: src/sys/dev beat back the undead: __BROKEN_INDIRECT_CONFIG had r...

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6328ac3a86e9
branches:  trunk
changeset: 488031:6328ac3a86e9
user:      cgd <cgd%NetBSD.org@localhost>
date:      Fri Jun 16 23:41:33 2000 +0000

description:
beat back the undead: __BROKEN_INDIRECT_CONFIG had risen, and was
terrorizing innocent hackers...

diffstat:

 sys/dev/cardbus/cardbus.c  |  23 +----------------------
 sys/dev/cardbus/cardslot.c |  12 +-----------
 sys/dev/ic/tcic2.c         |  13 +------------
 sys/dev/pci/pccbb.c        |  10 +---------
 4 files changed, 4 insertions(+), 54 deletions(-)

diffs (150 lines):

diff -r cf2ed6977276 -r 6328ac3a86e9 sys/dev/cardbus/cardbus.c
--- a/sys/dev/cardbus/cardbus.c Fri Jun 16 23:33:47 2000 +0000
+++ b/sys/dev/cardbus/cardbus.c Fri Jun 16 23:41:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardbus.c,v 1.25 2000/04/17 09:16:38 joda Exp $        */
+/*     $NetBSD: cardbus.c,v 1.26 2000/06/16 23:41:33 cgd Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999 and 2000
@@ -103,21 +103,11 @@
 
 
 STATIC int
-#if defined __BROKEN_INDIRECT_CONFIG
-cardbusmatch(parent, match, aux)
-     struct device *parent;
-     void *match;
-     void *aux;
-#else
 cardbusmatch(parent, cf, aux)
      struct device *parent;
      struct cfdata *cf;
      void *aux;
-#endif
 {
-#if defined __BROKEN_INDIRECT_CONFIG
-  struct cfdata *cf = match;
-#endif
   struct cbslot_attach_args *cba = aux;
 
   if (strcmp(cba->cba_busname, cf->cf_driver->cd_name)) {
@@ -558,22 +548,11 @@
 
 
 static int
-#ifdef __BROKEN_INDIRECT_CONFIG
-cardbussubmatch(parent, match, aux)
-#else
 cardbussubmatch(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 cardbus_attach_args *ca = aux;
 
   if (cf->cardbuscf_dev != CARDBUS_UNK_DEV &&
diff -r cf2ed6977276 -r 6328ac3a86e9 sys/dev/cardbus/cardslot.c
--- a/sys/dev/cardbus/cardslot.c        Fri Jun 16 23:33:47 2000 +0000
+++ b/sys/dev/cardbus/cardslot.c        Fri Jun 16 23:41:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $        */
+/*     $NetBSD: cardslot.c,v 1.10 2000/06/16 23:41:33 cgd Exp $        */
 
 /*
  * Copyright (c) 1999 and 2000
@@ -88,21 +88,11 @@
 
 
 STATIC int
-#if defined __BROKEN_INDIRECT_CONFIG
-cardslotmatch(parent, match, aux)
-     struct device *parent;
-     void *match;
-     void *aux;
-#else
 cardslotmatch(parent, cf, aux)
      struct device *parent;
      struct cfdata *cf;
      void *aux;
-#endif
 {
-#if defined __BROKEN_INDIRECT_CONFIG
-  struct cfdata *cf = match;
-#endif
   struct cardslot_attach_args *caa = aux;
 
   if (caa->caa_cb_attach == NULL && caa->caa_16_attach == NULL) {
diff -r cf2ed6977276 -r 6328ac3a86e9 sys/dev/ic/tcic2.c
--- a/sys/dev/ic/tcic2.c        Fri Jun 16 23:33:47 2000 +0000
+++ b/sys/dev/ic/tcic2.c        Fri Jun 16 23:41:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcic2.c,v 1.4 2000/05/08 19:44:34 explorer Exp $       */
+/*     $NetBSD: tcic2.c,v 1.5 2000/06/16 23:41:34 cgd Exp $    */
 
 #undef TCICDEBUG
 
@@ -531,22 +531,11 @@
 }
 
 int
-#ifdef __BROKEN_INDIRECT_CONFIG
-tcic_submatch(parent, match, aux)
-#else
 tcic_submatch(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 pcmciabus_attach_args *paa = aux;
        struct tcic_handle *h = (struct tcic_handle *) paa->pch;
diff -r cf2ed6977276 -r 6328ac3a86e9 sys/dev/pci/pccbb.c
--- a/sys/dev/pci/pccbb.c       Fri Jun 16 23:33:47 2000 +0000
+++ b/sys/dev/pci/pccbb.c       Fri Jun 16 23:41:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pccbb.c,v 1.41 2000/06/08 10:28:28 haya Exp $  */
+/*     $NetBSD: pccbb.c,v 1.42 2000/06/16 23:41:35 cgd Exp $   */
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -89,11 +89,7 @@
 #define STATIC static
 #endif
 
-#ifdef __BROKEN_INDIRECT_CONFIG
-int pcicbbmatch __P((struct device *, void *, void *));
-#else
 int pcicbbmatch __P((struct device *, struct cfdata *, void *));
-#endif
 void pccbbattach __P((struct device *, struct device *, void *));
 int pccbbintr __P((void *));
 static void pci113x_insert __P((void *));
@@ -260,11 +256,7 @@
 int
 pcicbbmatch(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;