diff options
| author | thorpej <thorpej@NetBSD.org> | 2002-09-30 20:43:55 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2002-09-30 20:43:55 +0000 |
| commit | bacf3a10fa4c5f16b0ff1d5aedd87e0794d0c158 (patch) | |
| tree | ff8d2ce71c874a3aab4d61d4beb3c30d7c33ff33 /sys/dev | |
| parent | b987253ef1c410ff5d1f5ff4ab25c89f6416e12c (diff) | |
Use CFATTACH_DECL().
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/bi/if_ni.c | 9 | ||||
| -rw-r--r-- | sys/dev/bi/kdb.c | 9 | ||||
| -rw-r--r-- | sys/dev/bi/uba_bi.c | 9 | ||||
| -rw-r--r-- | sys/dev/bluetooth/bthci.c | 8 | ||||
| -rw-r--r-- | sys/dev/cardbus/adv_cardbus.c | 10 | ||||
| -rw-r--r-- | sys/dev/cardbus/ahc_cardbus.c | 10 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 9 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardslot.c | 10 | ||||
| -rw-r--r-- | sys/dev/cardbus/com_cardbus.c | 10 | ||||
| -rw-r--r-- | sys/dev/cardbus/ehci_cardbus.c | 10 | ||||
| -rw-r--r-- | sys/dev/cardbus/fwohci_cardbus.c | 11 | ||||
| -rw-r--r-- | sys/dev/cardbus/if_ex_cardbus.c | 10 | ||||
| -rw-r--r-- | sys/dev/cardbus/if_fxp_cardbus.c | 10 | ||||
| -rw-r--r-- | sys/dev/cardbus/if_rtk_cardbus.c | 11 | ||||
| -rw-r--r-- | sys/dev/cardbus/if_tlp_cardbus.c | 11 | ||||
| -rw-r--r-- | sys/dev/cardbus/ohci_cardbus.c | 10 | ||||
| -rw-r--r-- | sys/dev/cardbus/rbus_ppb.c | 13 | ||||
| -rw-r--r-- | sys/dev/dec/dzkbd.c | 9 | ||||
| -rw-r--r-- | sys/dev/dec/dzms.c | 9 |
19 files changed, 76 insertions, 112 deletions
diff --git a/sys/dev/bi/if_ni.c b/sys/dev/bi/if_ni.c index 1a36946c726..224c158b1d6 100644 --- a/sys/dev/bi/if_ni.c +++ b/sys/dev/bi/if_ni.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ni.c,v 1.16 2002/09/27 20:37:37 thorpej Exp $ */ +/* $NetBSD: if_ni.c,v 1.17 2002/09/30 20:43:55 thorpej Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. * @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.16 2002/09/27 20:37:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.17 2002/09/30 20:43:55 thorpej Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -153,9 +153,8 @@ static int failtest(struct ni_softc *, int, int, int, char *); volatile int endwait, retry; /* Used during autoconfig */ -const struct cfattach ni_ca = { - sizeof(struct ni_softc), nimatch, niattach -}; +CFATTACH_DECL(ni, sizeof(struct ni_softc), + nimatch, niattach, NULL, NULL) #define NI_WREG(csr, val) \ bus_space_write_4(sc->sc_iot, sc->sc_ioh, csr, val) diff --git a/sys/dev/bi/kdb.c b/sys/dev/bi/kdb.c index 0471928ddb1..e7706e303b2 100644 --- a/sys/dev/bi/kdb.c +++ b/sys/dev/bi/kdb.c @@ -1,4 +1,4 @@ -/* $NetBSD: kdb.c,v 1.27 2002/09/27 20:37:38 thorpej Exp $ */ +/* $NetBSD: kdb.c,v 1.28 2002/09/30 20:43:56 thorpej Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.27 2002/09/27 20:37:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.28 2002/09/30 20:43:56 thorpej Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -98,9 +98,8 @@ int kdbprint __P((void *, const char *)); void kdbsaerror __P((struct device *, int)); void kdbgo __P((struct device *, struct mscp_xi *)); -const struct cfattach kdb_ca = { - sizeof(struct kdb_softc), kdbmatch, kdbattach -}; +CFATTACH_DECL(kdb, sizeof(struct kdb_softc), + kdbmatch, kdbattach, NULL, NULL) /* * More driver definitions, for generic MSCP code. diff --git a/sys/dev/bi/uba_bi.c b/sys/dev/bi/uba_bi.c index 51e86c48692..4887d17241c 100644 --- a/sys/dev/bi/uba_bi.c +++ b/sys/dev/bi/uba_bi.c @@ -1,4 +1,4 @@ -/* $NetBSD: uba_bi.c,v 1.6 2002/09/27 20:37:38 thorpej Exp $ */ +/* $NetBSD: uba_bi.c,v 1.7 2002/09/30 20:43:56 thorpej Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uba_bi.c,v 1.6 2002/09/27 20:37:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uba_bi.c,v 1.7 2002/09/30 20:43:56 thorpej Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -92,9 +92,8 @@ static void bua_purge __P((struct uba_softc *, int)); static int allocvec; -const struct cfattach uba_bi_ca = { - sizeof(struct uba_softc), uba_bi_match, uba_bi_attach, -}; +CFATTACH_DECL(uba_bi, sizeof(struct uba_softc), + uba_bi_match, uba_bi_attach, NULL, NULL) struct dwbua_regs { struct biiregs bn_biic; /* interface */ diff --git a/sys/dev/bluetooth/bthci.c b/sys/dev/bluetooth/bthci.c index ef760b27caf..15aaef6ad6a 100644 --- a/sys/dev/bluetooth/bthci.c +++ b/sys/dev/bluetooth/bthci.c @@ -1,4 +1,4 @@ -/* $NetBSD: bthci.c,v 1.5 2002/09/27 20:37:39 thorpej Exp $ */ +/* $NetBSD: bthci.c,v 1.6 2002/09/30 20:45:18 thorpej Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -73,10 +73,8 @@ struct cfdriver bthci_cd = { }; #endif -const struct cfattach bthci_ca = { - sizeof(struct bthci_softc), bthci_match, bthci_attach, - bthci_detach, bthci_activate -}; +CFATTACH_DECL(bthci, sizeof(struct bthci_softc), + bthci_match, bthci_attach, bthci_detach, bthci_activate) extern const struct cfattach bthci_ca; extern struct cfdriver bthci_cd; diff --git a/sys/dev/cardbus/adv_cardbus.c b/sys/dev/cardbus/adv_cardbus.c index b0d9ef269e8..072fd131a60 100644 --- a/sys/dev/cardbus/adv_cardbus.c +++ b/sys/dev/cardbus/adv_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: adv_cardbus.c,v 1.6 2002/09/27 20:37:40 thorpej Exp $ */ +/* $NetBSD: adv_cardbus.c,v 1.7 2002/09/30 20:52:26 thorpej Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.6 2002/09/27 20:37:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.7 2002/09/30 20:52:26 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,10 +93,8 @@ int adv_cardbus_match __P((struct device *, struct cfdata *, void *)); void adv_cardbus_attach __P((struct device *, struct device *, void *)); int adv_cardbus_detach __P((struct device *, int)); -const struct cfattach adv_cardbus_ca = { - sizeof(struct adv_cardbus_softc), adv_cardbus_match, adv_cardbus_attach, - adv_cardbus_detach -}; +CFATTACH_DECL(adv_cardbus, sizeof(struct adv_cardbus_softc), + adv_cardbus_match, adv_cardbus_attach, adv_cardbus_detach, NULL) int adv_cardbus_match(parent, match, aux) diff --git a/sys/dev/cardbus/ahc_cardbus.c b/sys/dev/cardbus/ahc_cardbus.c index 8cddecd0583..ea916e2e60f 100644 --- a/sys/dev/cardbus/ahc_cardbus.c +++ b/sys/dev/cardbus/ahc_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahc_cardbus.c,v 1.7 2002/09/27 20:37:40 thorpej Exp $ */ +/* $NetBSD: ahc_cardbus.c,v 1.8 2002/09/30 20:52:26 thorpej Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.7 2002/09/27 20:37:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.8 2002/09/30 20:52:26 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,10 +90,8 @@ int ahc_cardbus_match __P((struct device *, struct cfdata *, void *)); void ahc_cardbus_attach __P((struct device *, struct device *, void *)); int ahc_cardbus_detach __P((struct device *, int)); -const struct cfattach ahc_cardbus_ca = { - sizeof(struct ahc_cardbus_softc), ahc_cardbus_match, ahc_cardbus_attach, - ahc_cardbus_detach, ahc_activate -}; +CFATTACH_DECL(ahc_cardbus, sizeof(struct ahc_cardbus_softc), + ahc_cardbus_match, ahc_cardbus_attach, ahc_cardbus_detach, ahc_activate) int ahc_cardbus_match(parent, match, aux) diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 66d7af88a63..d5731a28461 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cardbus.c,v 1.44 2002/09/27 20:37:40 thorpej Exp $ */ +/* $NetBSD: cardbus.c,v 1.45 2002/09/30 20:52:26 thorpej Exp $ */ /* * Copyright (c) 1997, 1998, 1999 and 2000 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.44 2002/09/27 20:37:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.45 2002/09/30 20:52:26 thorpej Exp $"); #include "opt_cardbus.h" @@ -87,9 +87,8 @@ static int cardbus_read_tuples(struct cardbus_attach_args *, static void enable_function(struct cardbus_softc *, int, int); static void disable_function(struct cardbus_softc *, int); -const struct cfattach cardbus_ca = { - sizeof(struct cardbus_softc), cardbusmatch, cardbusattach -}; +CFATTACH_DECL(cardbus, sizeof(struct cardbus_softc), + cardbusmatch, cardbusattach, NULL, NULL) #ifndef __NetBSD_Version__ struct cfdriver cardbus_cd = { diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c index 669a0b8e363..e6b06c231e4 100644 --- a/sys/dev/cardbus/cardslot.c +++ b/sys/dev/cardbus/cardslot.c @@ -1,4 +1,4 @@ -/* $NetBSD: cardslot.c,v 1.19 2002/09/27 20:37:41 thorpej Exp $ */ +/* $NetBSD: cardslot.c,v 1.20 2002/09/30 20:52:27 thorpej Exp $ */ /* * Copyright (c) 1999 and 2000 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.19 2002/09/27 20:37:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.20 2002/09/30 20:52:27 thorpej Exp $"); #include "opt_cardslot.h" @@ -74,10 +74,8 @@ STATIC int cardslot_cb_print __P((void *aux, const char *pcic)); static int cardslot_16_print __P((void *, const char *)); static int cardslot_16_submatch __P((struct device *, struct cfdata *,void *)); -const struct cfattach cardslot_ca = { - sizeof(struct cardslot_softc), cardslotmatch, cardslotattach -}; - +CFATTACH_DECL(cardslot, sizeof(struct cardslot_softc), + cardslotmatch, cardslotattach, NULL, NULL) STATIC int cardslotmatch(parent, cf, aux) diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c index ce2df7eb6da..1be9ddc3673 100644 --- a/sys/dev/cardbus/com_cardbus.c +++ b/sys/dev/cardbus/com_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_cardbus.c,v 1.7 2002/09/27 20:37:42 thorpej Exp $ */ +/* $NetBSD: com_cardbus.c,v 1.8 2002/09/30 20:52:27 thorpej Exp $ */ /* * Copyright (c) 2000 Johan Danielsson @@ -40,7 +40,7 @@ updated below. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.7 2002/09/27 20:37:42 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.8 2002/09/30 20:52:27 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,10 +79,8 @@ static void com_cardbus_setup(struct com_cardbus_softc*); static int com_cardbus_enable (struct com_softc*); static void com_cardbus_disable (struct com_softc*); -const struct cfattach com_cardbus_ca = { - sizeof(struct com_cardbus_softc), com_cardbus_match, - com_cardbus_attach, com_cardbus_detach, com_activate -}; +CFATTACH_DECL(com_cardbus, sizeof(struct com_cardbus_softc), + com_cardbus_match, com_cardbus_attach, com_cardbus_detach, com_activate) static struct csdev { int vendor; diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c index 40c70507c3c..3339fe93446 100644 --- a/sys/dev/cardbus/ehci_cardbus.c +++ b/sys/dev/cardbus/ehci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ehci_cardbus.c,v 1.4 2002/09/27 20:37:42 thorpej Exp $ */ +/* $NetBSD: ehci_cardbus.c,v 1.5 2002/09/30 20:52:27 thorpej Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.4 2002/09/27 20:37:42 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.5 2002/09/30 20:52:27 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -84,10 +84,8 @@ struct ehci_cardbus_softc { void *sc_ih; /* interrupt vectoring */ }; -const struct cfattach ehci_cardbus_ca = { - sizeof(struct ehci_cardbus_softc), ehci_cardbus_match, - ehci_cardbus_attach, ehci_cardbus_detach, ehci_activate -}; +CFATTACH_DECL(ehci_cardbus, sizeof(struct ehci_cardbus_softc), + ehci_cardbus_match, ehci_cardbus_attach, ehci_cardbus_detach, ehci_activate) #define CARDBUS_INTERFACE_EHCI PCI_INTERFACE_EHCI #define CARDBUS_CBMEM PCI_CBMEM diff --git a/sys/dev/cardbus/fwohci_cardbus.c b/sys/dev/cardbus/fwohci_cardbus.c index bf7b5351d3f..a9f87da7d9c 100644 --- a/sys/dev/cardbus/fwohci_cardbus.c +++ b/sys/dev/cardbus/fwohci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci_cardbus.c,v 1.6 2002/09/27 20:37:43 thorpej Exp $ */ +/* $NetBSD: fwohci_cardbus.c,v 1.7 2002/09/30 20:52:28 thorpej Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.6 2002/09/27 20:37:43 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.7 2002/09/30 20:52:28 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,10 +70,9 @@ static int fwohci_cardbus_match(struct device *, struct cfdata *, void *); static void fwohci_cardbus_attach(struct device *, struct device *, void *); static int fwohci_cardbus_detach(struct device *, int); -const struct cfattach fwohci_cardbus_ca = { - sizeof(struct fwohci_cardbus_softc), fwohci_cardbus_match, fwohci_cardbus_attach, - fwohci_cardbus_detach, fwohci_activate -}; +CFATTACH_DECL(fwohci_cardbus, sizeof(struct fwohci_cardbus_softc), + fwohci_cardbus_match, fwohci_cardbus_attach, + fwohci_cardbus_detach, fwohci_activate) #define CARDBUS_OHCI_MAP_REGISTER PCI_OHCI_MAP_REGISTER #define CARDBUS_INTERFACE_OHCI PCI_INTERFACE_OHCI diff --git a/sys/dev/cardbus/if_ex_cardbus.c b/sys/dev/cardbus/if_ex_cardbus.c index f91e328c3cf..a6b58d036dd 100644 --- a/sys/dev/cardbus/if_ex_cardbus.c +++ b/sys/dev/cardbus/if_ex_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ex_cardbus.c,v 1.25 2002/09/27 20:37:43 thorpej Exp $ */ +/* $NetBSD: if_ex_cardbus.c,v 1.26 2002/09/30 20:52:28 thorpej Exp $ */ /* * CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.25 2002/09/27 20:37:43 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.26 2002/09/30 20:52:28 thorpej Exp $"); /* #define EX_DEBUG 4 */ /* define to report information for debugging */ @@ -121,10 +121,8 @@ struct ex_cardbus_softc { }; -const struct cfattach ex_cardbus_ca = { - sizeof(struct ex_cardbus_softc), ex_cardbus_match, - ex_cardbus_attach, ex_cardbus_detach, ex_activate -}; +CFATTACH_DECL(ex_cardbus, sizeof(struct ex_cardbus_softc), + ex_cardbus_match, ex_cardbus_attach, ex_cardbus_detach, ex_activate) const struct ex_cardbus_product { u_int32_t ecp_prodid; /* CardBus product ID */ diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c index b387d821be2..a167a4b119a 100644 --- a/sys/dev/cardbus/if_fxp_cardbus.c +++ b/sys/dev/cardbus/if_fxp_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fxp_cardbus.c,v 1.15 2002/09/27 20:37:44 thorpej Exp $ */ +/* $NetBSD: if_fxp_cardbus.c,v 1.16 2002/09/30 20:52:28 thorpej Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.15 2002/09/27 20:37:44 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.16 2002/09/30 20:52:28 thorpej Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -113,10 +113,8 @@ struct fxp_cardbus_softc { bus_size_t size; }; -const struct cfattach fxp_cardbus_ca = { - sizeof(struct fxp_cardbus_softc), fxp_cardbus_match, fxp_cardbus_attach, - fxp_cardbus_detach, fxp_activate -}; +CFATTACH_DECL(fxp_cardbus, sizeof(struct fxp_cardbus_softc), + fxp_cardbus_match, fxp_cardbus_attach, fxp_cardbus_detach, fxp_activate) #ifdef CBB_DEBUG #define DPRINTF(X) printf X diff --git a/sys/dev/cardbus/if_rtk_cardbus.c b/sys/dev/cardbus/if_rtk_cardbus.c index 27ccbf78ac3..355badba216 100644 --- a/sys/dev/cardbus/if_rtk_cardbus.c +++ b/sys/dev/cardbus/if_rtk_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtk_cardbus.c,v 1.9 2002/09/27 20:37:44 thorpej Exp $ */ +/* $NetBSD: if_rtk_cardbus.c,v 1.10 2002/09/30 20:52:28 thorpej Exp $ */ /* * Copyright (c) 2000 Masanori Kanaoka @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.9 2002/09/27 20:37:44 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.10 2002/09/30 20:52:28 thorpej Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -136,11 +136,8 @@ struct rtk_cardbus_softc { int sc_intrline; }; -const struct cfattach rtk_cardbus_ca = { - sizeof(struct rtk_cardbus_softc), - rtk_cardbus_match, rtk_cardbus_attach, - rtk_cardbus_detach, rtk_activate, -}; +CFATTACH_DECL(rtk_cardbus, sizeof(struct rtk_cardbus_softc), + rtk_cardbus_match, rtk_cardbus_attach, rtk_cardbus_detach, rtk_activate) const struct rtk_type *rtk_cardbus_lookup __P((const struct cardbus_attach_args *)); diff --git a/sys/dev/cardbus/if_tlp_cardbus.c b/sys/dev/cardbus/if_tlp_cardbus.c index 19994af02e5..a976c73e228 100644 --- a/sys/dev/cardbus/if_tlp_cardbus.c +++ b/sys/dev/cardbus/if_tlp_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tlp_cardbus.c,v 1.35 2002/09/27 20:37:45 thorpej Exp $ */ +/* $NetBSD: if_tlp_cardbus.c,v 1.36 2002/09/30 20:52:28 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.35 2002/09/27 20:37:45 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.36 2002/09/30 20:52:28 thorpej Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -128,11 +128,8 @@ int tlp_cardbus_match __P((struct device *, struct cfdata *, void *)); void tlp_cardbus_attach __P((struct device *, struct device *, void *)); int tlp_cardbus_detach __P((struct device *, int)); -const struct cfattach tlp_cardbus_ca = { - sizeof(struct tulip_cardbus_softc), - tlp_cardbus_match, tlp_cardbus_attach, - tlp_cardbus_detach, tlp_activate, -}; +CFATTACH_DECL(tlp_cardbus, sizeof(struct tulip_cardbus_softc), + tlp_cardbus_match, tlp_cardbus_attach, tlp_cardbus_detach, tlp_activate) const struct tulip_cardbus_product { u_int32_t tcp_vendor; /* PCI vendor ID */ diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c index 84869a96f0b..dedcf053597 100644 --- a/sys/dev/cardbus/ohci_cardbus.c +++ b/sys/dev/cardbus/ohci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ohci_cardbus.c,v 1.12 2002/09/27 20:37:46 thorpej Exp $ */ +/* $NetBSD: ohci_cardbus.c,v 1.13 2002/09/30 20:52:29 thorpej Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.12 2002/09/27 20:37:46 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.13 2002/09/30 20:52:29 thorpej Exp $"); #include "ehci.h" @@ -89,10 +89,8 @@ struct ohci_cardbus_softc { void *sc_ih; /* interrupt vectoring */ }; -const struct cfattach ohci_cardbus_ca = { - sizeof(struct ohci_cardbus_softc), ohci_cardbus_match, - ohci_cardbus_attach, ohci_cardbus_detach, ohci_activate -}; +CFATTACH_DECL(ohci_cardbus, sizeof(struct ohci_cardbus_softc), + ohci_cardbus_match, ohci_cardbus_attach, ohci_cardbus_detach, ohci_activate) #define CARDBUS_INTERFACE_OHCI PCI_INTERFACE_OHCI #define CARDBUS_CBMEM PCI_CBMEM diff --git a/sys/dev/cardbus/rbus_ppb.c b/sys/dev/cardbus/rbus_ppb.c index 8a69f9b8e32..fc02d540b7f 100644 --- a/sys/dev/cardbus/rbus_ppb.c +++ b/sys/dev/cardbus/rbus_ppb.c @@ -1,4 +1,4 @@ -/* $NetBSD: rbus_ppb.c,v 1.6 2002/09/27 20:37:46 thorpej Exp $ */ +/* $NetBSD: rbus_ppb.c,v 1.7 2002/09/30 20:52:29 thorpej Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.6 2002/09/27 20:37:46 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.7 2002/09/30 20:52:29 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -129,13 +129,8 @@ struct ppb_cardbus_softc { int foo; }; -const struct cfattach rbus_ppb_ca = { - sizeof(struct ppb_cardbus_softc), - ppb_cardbus_match, - ppb_cardbus_attach, - ppb_cardbus_detach, - ppb_activate -}; +CFATTACH_DECL(rbus_ppb, sizeof(struct ppb_cardbus_softc), + ppb_cardbus_match, ppb_cardbus_attach, ppb_cardbus_detach, ppb_activate) #ifdef CBB_DEBUG int rbus_ppb_debug = 0; /* hack with kdb */ diff --git a/sys/dev/dec/dzkbd.c b/sys/dev/dec/dzkbd.c index f1a7e6f564d..e5065d5c22f 100644 --- a/sys/dev/dec/dzkbd.c +++ b/sys/dev/dec/dzkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzkbd.c,v 1.8 2002/09/27 20:37:47 thorpej Exp $ */ +/* $NetBSD: dzkbd.c,v 1.9 2002/09/30 20:53:39 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.8 2002/09/27 20:37:47 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.9 2002/09/30 20:53:39 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -97,9 +97,8 @@ static int dzkbd_input __P((void *, int)); static int dzkbd_match __P((struct device *, struct cfdata *, void *)); static void dzkbd_attach __P((struct device *, struct device *, void *)); -const struct cfattach dzkbd_ca = { - sizeof(struct dzkbd_softc), dzkbd_match, dzkbd_attach, -}; +CFATTACH_DECL(dzkbd, sizeof(struct dzkbd_softc), + dzkbd_match, dzkbd_attach, NULL, NULL) static int dzkbd_enable __P((void *, int)); static void dzkbd_set_leds __P((void *, int)); diff --git a/sys/dev/dec/dzms.c b/sys/dev/dec/dzms.c index 839cdd93677..f33c87a78a2 100644 --- a/sys/dev/dec/dzms.c +++ b/sys/dev/dec/dzms.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzms.c,v 1.7 2002/09/27 20:37:47 thorpej Exp $ */ +/* $NetBSD: dzms.c,v 1.8 2002/09/30 20:53:39 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.7 2002/09/27 20:37:47 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.8 2002/09/30 20:53:39 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,9 +90,8 @@ static int dzms_match __P((struct device *, struct cfdata *, void *)); static void dzms_attach __P((struct device *, struct device *, void *)); static int dzms_input __P((void *, int)); -const struct cfattach dzms_ca = { - sizeof(struct dzms_softc), dzms_match, dzms_attach, -}; +CFATTACH_DECL(dzms, sizeof(struct dzms_softc), + dzms_match, dzms_attach, NULL, NULL) static int dzms_enable __P((void *)); static int dzms_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); |
