diff options
| author | cgd <cgd@NetBSD.org> | 2000-06-16 23:41:33 +0000 |
|---|---|---|
| committer | cgd <cgd@NetBSD.org> | 2000-06-16 23:41:33 +0000 |
| commit | eee18e1f6cce6f7beec79c0b773db0ed013b1c01 (patch) | |
| tree | c50505bd3058c92d89baa1a0ed4af051e0158bf3 | |
| parent | 6bda02ae4ba9ab0d6a3859772e5f147dbc6aab3d (diff) | |
beat back the undead: __BROKEN_INDIRECT_CONFIG had risen, and was
terrorizing innocent hackers...
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 23 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardslot.c | 12 | ||||
| -rw-r--r-- | sys/dev/ic/tcic2.c | 13 | ||||
| -rw-r--r-- | sys/dev/pci/pccbb.c | 10 |
4 files changed, 4 insertions, 54 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 2622b61453a..3499c20d75b 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -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 @@ struct cfdriver cardbus_cd = { 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 @@ cardbus_attach_card(sc) 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 --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c index fb475fe2b84..cb6a8c571c4 100644 --- a/sys/dev/cardbus/cardslot.c +++ b/sys/dev/cardbus/cardslot.c @@ -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 @@ struct cfdriver cardslot_cd = { 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 --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c index 8f292d49150..a58298835a7 100644 --- a/sys/dev/ic/tcic2.c +++ b/sys/dev/ic/tcic2.c @@ -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 @@ tcic_init_socket(h) } 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 --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index d6dcdd95c6d..d641692b705 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -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 @@ struct cfdriver cbb_cd = { #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 @@ static struct cardbus_functions pccbb_funcs = { 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; |
