diff options
| author | thorpej <thorpej@NetBSD.org> | 2002-09-30 21:31:52 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2002-09-30 21:31:52 +0000 |
| commit | 9bb77522c10734edbc8215c601d0c400a515285c (patch) | |
| tree | b6327228b26ab0738dcf3cea52d79c6315c727fc /sys/dev | |
| parent | e9d707fbd5eb3e9e8b02741357fd5ed7071107e6 (diff) | |
Use CFATTACH_DECL().
Diffstat (limited to 'sys/dev')
33 files changed, 130 insertions, 171 deletions
diff --git a/sys/dev/isapnp/aha_isapnp.c b/sys/dev/isapnp/aha_isapnp.c index b63777458b6..c6f638e47a9 100644 --- a/sys/dev/isapnp/aha_isapnp.c +++ b/sys/dev/isapnp/aha_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: aha_isapnp.c,v 1.5 2002/09/27 20:38:59 thorpej Exp $ */ +/* $NetBSD: aha_isapnp.c,v 1.6 2002/09/30 21:31:52 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.5 2002/09/27 20:38:59 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.6 2002/09/30 21:31:52 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,9 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.5 2002/09/27 20:38:59 thorpej Exp $ int aha_isapnp_probe __P((struct device *, struct cfdata *, void *)); void aha_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach aha_isapnp_ca = { - sizeof(struct aha_softc), aha_isapnp_probe, aha_isapnp_attach -}; +CFATTACH_DECL(aha_isapnp, sizeof(struct aha_softc), + aha_isapnp_probe, aha_isapnp_attach, NULL, NULL) int aha_isapnp_probe(parent, match, aux) diff --git a/sys/dev/isapnp/aic_isapnp.c b/sys/dev/isapnp/aic_isapnp.c index edd1160dc2b..236df0996d0 100644 --- a/sys/dev/isapnp/aic_isapnp.c +++ b/sys/dev/isapnp/aic_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic_isapnp.c,v 1.7 2002/09/27 20:38:59 thorpej Exp $ */ +/* $NetBSD: aic_isapnp.c,v 1.8 2002/09/30 21:31:52 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.7 2002/09/27 20:38:59 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.8 2002/09/30 21:31:52 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -67,9 +67,8 @@ struct aic_isapnp_softc { int aic_isapnp_match __P((struct device *, struct cfdata *, void *)); void aic_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach aic_isapnp_ca = { - sizeof(struct aic_isapnp_softc), aic_isapnp_match, aic_isapnp_attach -}; +CFATTACH_DECL(aic_isapnp, sizeof(struct aic_isapnp_softc), + aic_isapnp_match, aic_isapnp_attach, NULL, NULL) int aic_isapnp_match(parent, match, aux) diff --git a/sys/dev/isapnp/com_isapnp.c b/sys/dev/isapnp/com_isapnp.c index cb843d9eaad..391f1b1c311 100644 --- a/sys/dev/isapnp/com_isapnp.c +++ b/sys/dev/isapnp/com_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_isapnp.c,v 1.18 2002/09/27 20:39:00 thorpej Exp $ */ +/* $NetBSD: com_isapnp.c,v 1.19 2002/09/30 21:31:53 thorpej Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.18 2002/09/27 20:39:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.19 2002/09/30 21:31:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -69,9 +69,8 @@ struct com_isapnp_softc { int com_isapnp_match __P((struct device *, struct cfdata *, void *)); void com_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach com_isapnp_ca = { - sizeof(struct com_isapnp_softc), com_isapnp_match, com_isapnp_attach -}; +CFATTACH_DECL(com_isapnp, sizeof(struct com_isapnp_softc), + com_isapnp_match, com_isapnp_attach, NULL, NULL) int com_isapnp_match(parent, match, aux) diff --git a/sys/dev/isapnp/ess_isapnp.c b/sys/dev/isapnp/ess_isapnp.c index 0061d283acf..14bbabb46ae 100644 --- a/sys/dev/isapnp/ess_isapnp.c +++ b/sys/dev/isapnp/ess_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: ess_isapnp.c,v 1.8 2002/09/27 20:39:00 thorpej Exp $ */ +/* $NetBSD: ess_isapnp.c,v 1.9 2002/09/30 21:31:53 thorpej Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.8 2002/09/27 20:39:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.9 2002/09/30 21:31:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,10 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.8 2002/09/27 20:39:00 thorpej Exp $ int ess_isapnp_match __P((struct device *, struct cfdata *, void *)); void ess_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach ess_isapnp_ca = { - sizeof(struct ess_softc), ess_isapnp_match, ess_isapnp_attach -}; - +CFATTACH_DECL(ess_isapnp, sizeof(struct ess_softc), + ess_isapnp_match, ess_isapnp_attach, NULL, NULL) /* * Probe / attach routines. diff --git a/sys/dev/isapnp/gus_isapnp.c b/sys/dev/isapnp/gus_isapnp.c index 9f2bf422642..a77a315728c 100644 --- a/sys/dev/isapnp/gus_isapnp.c +++ b/sys/dev/isapnp/gus_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: gus_isapnp.c,v 1.18 2002/09/27 20:39:01 thorpej Exp $ */ +/* $NetBSD: gus_isapnp.c,v 1.19 2002/09/30 21:31:53 thorpej Exp $ */ /* * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.18 2002/09/27 20:39:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.19 2002/09/30 21:31:53 thorpej Exp $"); #include "guspnp.h" #if NGUSPNP > 0 @@ -116,9 +116,8 @@ static struct audio_hw_if guspnp_hw_if = { -const struct cfattach guspnp_ca = { - sizeof(struct iw_softc), gus_isapnp_match, gus_isapnp_attach -}; +CFATTACH_DECL(guspnp, sizeof(struct iw_softc), + gus_isapnp_match, gus_isapnp_attach, NULL, NULL) extern struct cfdriver guspnp_cd; diff --git a/sys/dev/isapnp/i82365_isapnp.c b/sys/dev/isapnp/i82365_isapnp.c index 2cd8bcddc97..b5ec63d8cdd 100644 --- a/sys/dev/isapnp/i82365_isapnp.c +++ b/sys/dev/isapnp/i82365_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82365_isapnp.c,v 1.13 2002/09/27 20:39:02 thorpej Exp $ */ +/* $NetBSD: i82365_isapnp.c,v 1.14 2002/09/30 21:31:53 thorpej Exp $ */ /* * Copyright (c) 1998 Bill Sommerfeld. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.13 2002/09/27 20:39:02 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.14 2002/09/30 21:31:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,9 +68,8 @@ int pcicisapnp_debug = 0 /* XXX */ ; int pcic_isapnp_match __P((struct device *, struct cfdata *, void *)); void pcic_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach pcic_isapnp_ca = { - sizeof(struct pcic_isa_softc), pcic_isapnp_match, pcic_isapnp_attach -}; +CFATTACH_DECL(pcic_isapnp, sizeof(struct pcic_isa_softc), + pcic_isapnp_match, pcic_isapnp_attach, NULL, NULL) static struct pcmcia_chip_functions pcic_isa_functions = { pcic_chip_mem_alloc, diff --git a/sys/dev/isapnp/if_an_isapnp.c b/sys/dev/isapnp/if_an_isapnp.c index 060021e0c4e..4d24e096731 100644 --- a/sys/dev/isapnp/if_an_isapnp.c +++ b/sys/dev/isapnp/if_an_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_an_isapnp.c,v 1.5 2002/09/27 20:39:02 thorpej Exp $ */ +/* $NetBSD: if_an_isapnp.c,v 1.6 2002/09/30 21:31:53 thorpej Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.5 2002/09/27 20:39:02 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.6 2002/09/30 21:31:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -84,9 +84,8 @@ struct an_isapnp_softc { void *sc_ih; /* interrupt cookie */ }; -const struct cfattach an_isapnp_ca = { - sizeof(struct an_isapnp_softc), an_isapnp_match, an_isapnp_attach -}; +CFATTACH_DECL(an_isapnp, sizeof(struct an_isapnp_softc), + an_isapnp_match, an_isapnp_attach, NULL, NULL) int an_isapnp_match(struct device *parent, struct cfdata *match, void *aux) diff --git a/sys/dev/isapnp/if_cs_isapnp.c b/sys/dev/isapnp/if_cs_isapnp.c index 2709b5c5efa..1dde0cc0c95 100644 --- a/sys/dev/isapnp/if_cs_isapnp.c +++ b/sys/dev/isapnp/if_cs_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_isapnp.c,v 1.3 2002/09/27 20:39:03 thorpej Exp $ */ +/* $NetBSD: if_cs_isapnp.c,v 1.4 2002/09/30 21:31:53 thorpej Exp $ */ /*- * Copyright (c)2001 YAMAMOTO Takashi, @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.3 2002/09/27 20:39:03 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.4 2002/09/30 21:31:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,11 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.3 2002/09/27 20:39:03 thorpej Exp int cs_isapnp_match(struct device *, struct cfdata *, void *); void cs_isapnp_attach(struct device *, struct device *, void *); -const struct cfattach cs_isapnp_ca = { - sizeof(struct cs_softc), - cs_isapnp_match, - cs_isapnp_attach -}; +CFATTACH_DECL(cs_isapnp, sizeof(struct cs_softc), + cs_isapnp_match, cs_isapnp_attach, NULL, NULL) int cs_isapnp_match(parent, match, aux) diff --git a/sys/dev/isapnp/if_ep_isapnp.c b/sys/dev/isapnp/if_ep_isapnp.c index defbbf839f6..beecc1c5eb3 100644 --- a/sys/dev/isapnp/if_ep_isapnp.c +++ b/sys/dev/isapnp/if_ep_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_isapnp.c,v 1.23 2002/09/27 20:39:03 thorpej Exp $ */ +/* $NetBSD: if_ep_isapnp.c,v 1.24 2002/09/30 21:31:53 thorpej Exp $ */ /* * Copyright (c) 1997 Jonathan Stone <jonathan@NetBSD.org> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.23 2002/09/27 20:39:03 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.24 2002/09/30 21:31:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,9 +66,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.23 2002/09/27 20:39:03 thorpej Ex int ep_isapnp_match __P((struct device *, struct cfdata *, void *)); void ep_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach ep_isapnp_ca = { - sizeof(struct ep_softc), ep_isapnp_match, ep_isapnp_attach -}; +CFATTACH_DECL(ep_isapnp, sizeof(struct ep_softc), + ep_isapnp_match, ep_isapnp_attach, NULL, NULL) int ep_isapnp_match(parent, match, aux) diff --git a/sys/dev/isapnp/if_le_isapnp.c b/sys/dev/isapnp/if_le_isapnp.c index 19128f1abd2..97c312d98a6 100644 --- a/sys/dev/isapnp/if_le_isapnp.c +++ b/sys/dev/isapnp/if_le_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_isapnp.c,v 1.21 2002/09/27 20:39:04 thorpej Exp $ */ +/* $NetBSD: if_le_isapnp.c,v 1.22 2002/09/30 21:31:53 thorpej Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.21 2002/09/27 20:39:04 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.22 2002/09/30 21:31:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -107,9 +107,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.21 2002/09/27 20:39:04 thorpej Ex int le_isapnp_match __P((struct device *, struct cfdata *, void *)); void le_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach le_isapnp_ca = { - sizeof(struct le_softc), le_isapnp_match, le_isapnp_attach -}; +CFATTACH_DECL(le_isapnp, sizeof(struct le_softc), + le_isapnp_match, le_isapnp_attach, NULL, NULL) int le_isapnp_intredge __P((void *)); static void le_isapnp_wrcsr __P((struct lance_softc *, u_int16_t, u_int16_t)); diff --git a/sys/dev/isapnp/if_ne_isapnp.c b/sys/dev/isapnp/if_ne_isapnp.c index 72ec411ef47..2a78a8139c4 100644 --- a/sys/dev/isapnp/if_ne_isapnp.c +++ b/sys/dev/isapnp/if_ne_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_isapnp.c,v 1.15 2002/09/27 20:39:04 thorpej Exp $ */ +/* $NetBSD: if_ne_isapnp.c,v 1.16 2002/09/30 21:31:53 thorpej Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.15 2002/09/27 20:39:04 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.16 2002/09/30 21:31:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -83,9 +83,8 @@ struct ne_isapnp_softc { void *sc_ih; /* interrupt cookie */ }; -const struct cfattach ne_isapnp_ca = { - sizeof(struct ne_isapnp_softc), ne_isapnp_match, ne_isapnp_attach -}; +CFATTACH_DECL(ne_isapnp, sizeof(struct ne_isapnp_softc), + ne_isapnp_match, ne_isapnp_attach, NULL, NULL) static int ne_isapnp_match(parent, match, aux) diff --git a/sys/dev/isapnp/if_tr_isapnp.c b/sys/dev/isapnp/if_tr_isapnp.c index ea9061e4fef..b471b803850 100644 --- a/sys/dev/isapnp/if_tr_isapnp.c +++ b/sys/dev/isapnp/if_tr_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tr_isapnp.c,v 1.7 2002/09/27 20:39:05 thorpej Exp $ */ +/* $NetBSD: if_tr_isapnp.c,v 1.8 2002/09/30 21:31:53 thorpej Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.7 2002/09/27 20:39:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.8 2002/09/30 21:31:53 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,9 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.7 2002/09/27 20:39:05 thorpej Exp int tr_isapnp_match __P((struct device *, struct cfdata *, void *)); void tr_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach tr_isapnp_ca = { - sizeof(struct tr_softc), tr_isapnp_match, tr_isapnp_attach -}; +CFATTACH_DECL(tr_isapnp, sizeof(struct tr_softc), + tr_isapnp_match, tr_isapnp_attach, NULL, NULL) int tr_isapnp_match(parent, match, aux) diff --git a/sys/dev/isapnp/isapnp.c b/sys/dev/isapnp/isapnp.c index 0765506b178..3c8678a6b76 100644 --- a/sys/dev/isapnp/isapnp.c +++ b/sys/dev/isapnp/isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: isapnp.c,v 1.38 2002/09/27 20:39:05 thorpej Exp $ */ +/* $NetBSD: isapnp.c,v 1.39 2002/09/30 21:31:53 thorpej Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.38 2002/09/27 20:39:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.39 2002/09/30 21:31:53 thorpej Exp $"); #include "isadma.h" @@ -89,9 +89,8 @@ static int isapnp_match __P((struct device *, struct cfdata *, void *)); static void isapnp_attach __P((struct device *, struct device *, void *)); static void isapnp_callback __P((struct device *)); -const struct cfattach isapnp_ca = { - sizeof(struct isapnp_softc), isapnp_match, isapnp_attach -}; +CFATTACH_DECL(isapnp, sizeof(struct isapnp_softc), + isapnp_match, isapnp_attach, NULL, NULL) /* * This keeps track if which ISA's we have been probed on. diff --git a/sys/dev/isapnp/isic_isapnp.c b/sys/dev/isapnp/isic_isapnp.c index 20ef52b0ef9..ea38ab97525 100644 --- a/sys/dev/isapnp/isic_isapnp.c +++ b/sys/dev/isapnp/isic_isapnp.c @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.13 2002/09/27 20:39:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.14 2002/09/30 21:31:54 thorpej Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -89,9 +89,8 @@ static int isic_isapnp_probe __P((struct device *, struct cfdata *, void *)); #endif static void isic_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach isic_isapnp_ca = { - sizeof(struct isic_softc), isic_isapnp_probe, isic_isapnp_attach -}; +CFATTACH_DECL(isic_isapnp, sizeof(struct isic_softc), + isic_isapnp_probe, isic_isapnp_attach, NULL, NULL) typedef void (*allocmaps_func)(struct isapnp_attach_args *ipa, struct isic_softc *sc); typedef void (*attach_func)(struct isic_softc *sc); diff --git a/sys/dev/isapnp/joy_isapnp.c b/sys/dev/isapnp/joy_isapnp.c index a42c6f0f493..88932770797 100644 --- a/sys/dev/isapnp/joy_isapnp.c +++ b/sys/dev/isapnp/joy_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: joy_isapnp.c,v 1.2 2002/09/27 20:39:06 thorpej Exp $ */ +/* $NetBSD: joy_isapnp.c,v 1.3 2002/09/30 21:31:54 thorpej Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.2 2002/09/27 20:39:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.3 2002/09/30 21:31:54 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,9 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.2 2002/09/27 20:39:06 thorpej Exp $ int joy_isapnp_match __P((struct device *, struct cfdata *, void *)); void joy_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach joy_isapnp_ca = { - sizeof(struct joy_softc), joy_isapnp_match, joy_isapnp_attach -}; +CFATTACH_DECL(joy_isapnp, sizeof(struct joy_softc), + joy_isapnp_match, joy_isapnp_attach, NULL, NULL) int joy_isapnp_match(parent, match, aux) diff --git a/sys/dev/isapnp/mpu_isapnp.c b/sys/dev/isapnp/mpu_isapnp.c index e2d9530e900..01a5ce7056b 100644 --- a/sys/dev/isapnp/mpu_isapnp.c +++ b/sys/dev/isapnp/mpu_isapnp.c @@ -1,7 +1,7 @@ -/* $NetBSD: mpu_isapnp.c,v 1.6 2002/09/27 20:39:07 thorpej Exp $ */ +/* $NetBSD: mpu_isapnp.c,v 1.7 2002/09/30 21:31:54 thorpej Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.6 2002/09/27 20:39:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.7 2002/09/30 21:31:54 thorpej Exp $"); #include "midi.h" @@ -39,9 +39,8 @@ struct mpu_isapnp_softc { struct mpu_softc sc_mpu; }; -const struct cfattach mpu_isapnp_ca = { - sizeof(struct mpu_isapnp_softc), mpu_isapnp_match, mpu_isapnp_attach -}; +CFATTACH_DECL(mpu_isapnp, sizeof(struct mpu_isapnp_softc), + mpu_isapnp_match, mpu_isapnp_attach, NULL, NULL) int mpu_isapnp_match(parent, match, aux) diff --git a/sys/dev/isapnp/sb_isapnp.c b/sys/dev/isapnp/sb_isapnp.c index 1af7a70c70c..cb4d390f2cd 100644 --- a/sys/dev/isapnp/sb_isapnp.c +++ b/sys/dev/isapnp/sb_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sb_isapnp.c,v 1.39 2002/09/27 20:39:07 thorpej Exp $ */ +/* $NetBSD: sb_isapnp.c,v 1.40 2002/09/30 21:31:54 thorpej Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.39 2002/09/27 20:39:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.40 2002/09/30 21:31:54 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,10 +66,8 @@ __KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.39 2002/09/27 20:39:07 thorpej Exp $ int sb_isapnp_match __P((struct device *, struct cfdata *, void *)); void sb_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach sb_isapnp_ca = { - sizeof(struct sbdsp_softc), sb_isapnp_match, sb_isapnp_attach -}; - +CFATTACH_DECL(sb_isapnp, sizeof(struct sbdsp_softc), + sb_isapnp_match, sb_isapnp_attach, NULL, NULL) /* * Probe / attach routines. diff --git a/sys/dev/isapnp/wdc_isapnp.c b/sys/dev/isapnp/wdc_isapnp.c index 48d3143f1f2..d58c7fffea1 100644 --- a/sys/dev/isapnp/wdc_isapnp.c +++ b/sys/dev/isapnp/wdc_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: wdc_isapnp.c,v 1.16 2002/09/27 20:39:08 thorpej Exp $ */ +/* $NetBSD: wdc_isapnp.c,v 1.17 2002/09/30 21:31:54 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wdc_isapnp.c,v 1.16 2002/09/27 20:39:08 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdc_isapnp.c,v 1.17 2002/09/30 21:31:54 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,9 +70,8 @@ struct wdc_isapnp_softc { int wdc_isapnp_probe __P((struct device *, struct cfdata *, void *)); void wdc_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach wdc_isapnp_ca = { - sizeof(struct wdc_isapnp_softc), wdc_isapnp_probe, wdc_isapnp_attach -}; +CFATTACH_DECL(wdc_isapnp, sizeof(struct wdc_isapnp_softc), + wdc_isapnp_probe, wdc_isapnp_attach, NULL, NULL) #ifdef notyet static void wdc_isapnp_dma_setup __P((struct wdc_isapnp_softc *)); diff --git a/sys/dev/isapnp/wss_isapnp.c b/sys/dev/isapnp/wss_isapnp.c index cf9500a7835..3504ca57ba4 100644 --- a/sys/dev/isapnp/wss_isapnp.c +++ b/sys/dev/isapnp/wss_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: wss_isapnp.c,v 1.12 2002/09/27 20:39:08 thorpej Exp $ */ +/* $NetBSD: wss_isapnp.c,v 1.13 2002/09/30 21:31:54 thorpej Exp $ */ /* * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.12 2002/09/27 20:39:08 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.13 2002/09/30 21:31:54 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,10 +65,8 @@ __KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.12 2002/09/27 20:39:08 thorpej Exp int wss_isapnp_match __P((struct device *, struct cfdata *, void *)); void wss_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach wss_isapnp_ca = { - sizeof(struct wss_softc), wss_isapnp_match, wss_isapnp_attach -}; - +CFATTACH_DECL(wss_isapnp, sizeof(struct wss_softc), + wss_isapnp_match, wss_isapnp_attach, NULL, NULL) /* * Probe / attach routines. diff --git a/sys/dev/isapnp/ym_isapnp.c b/sys/dev/isapnp/ym_isapnp.c index 9d354c1cf8b..ce8dce34a1f 100644 --- a/sys/dev/isapnp/ym_isapnp.c +++ b/sys/dev/isapnp/ym_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: ym_isapnp.c,v 1.14 2002/09/27 20:39:08 thorpej Exp $ */ +/* $NetBSD: ym_isapnp.c,v 1.15 2002/09/30 21:31:54 thorpej Exp $ */ /* @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.14 2002/09/27 20:39:08 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.15 2002/09/30 21:31:54 thorpej Exp $"); #include "mpu_ym.h" @@ -75,10 +75,8 @@ __KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.14 2002/09/27 20:39:08 thorpej Exp $ int ym_isapnp_match __P((struct device *, struct cfdata *, void *)); void ym_isapnp_attach __P((struct device *, struct device *, void *)); -const struct cfattach ym_isapnp_ca = { - sizeof(struct ym_softc), ym_isapnp_match, ym_isapnp_attach -}; - +CFATTACH_DECL(ym_isapnp, sizeof(struct ym_softc), + ym_isapnp_match, ym_isapnp_attach, NULL, NULL) /* * Probe / attach routines. diff --git a/sys/dev/mca/aha_mca.c b/sys/dev/mca/aha_mca.c index ad93fcf34af..538776f4477 100644 --- a/sys/dev/mca/aha_mca.c +++ b/sys/dev/mca/aha_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: aha_mca.c,v 1.8 2002/09/27 20:39:09 thorpej Exp $ */ +/* $NetBSD: aha_mca.c,v 1.9 2002/09/30 21:36:45 thorpej Exp $ */ /* * Copyright (c) 2000-2002 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.8 2002/09/27 20:39:09 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.9 2002/09/30 21:36:45 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -80,10 +80,8 @@ __KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.8 2002/09/27 20:39:09 thorpej Exp $"); int aha_mca_probe __P((struct device *, struct cfdata *, void *)); void aha_mca_attach __P((struct device *, struct device *, void *)); -const struct cfattach aha_mca_ca = { - sizeof(struct aha_softc), aha_mca_probe, aha_mca_attach -}; - +CFATTACH_DECL(aha_mca, sizeof(struct aha_softc), + aha_mca_probe, aha_mca_attach, NULL, NULL) int aha_mca_probe(parent, match, aux) diff --git a/sys/dev/mca/com_mca.c b/sys/dev/mca/com_mca.c index 96d00fcc827..62d450f2611 100644 --- a/sys/dev/mca/com_mca.c +++ b/sys/dev/mca/com_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_mca.c,v 1.7 2002/09/27 20:39:10 thorpej Exp $ */ +/* $NetBSD: com_mca.c,v 1.8 2002/09/30 21:36:45 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.7 2002/09/27 20:39:10 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.8 2002/09/30 21:36:45 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -115,9 +115,8 @@ static int ibm_modem_getcfg __P((struct mca_attach_args *, int *, int *)); static int neocom1_getcfg __P((struct mca_attach_args *, int *, int *)); static int ibm_mpcom_getcfg __P((struct mca_attach_args *, int *, int *)); -const struct cfattach com_mca_ca = { - sizeof(struct com_mca_softc), com_mca_probe, com_mca_attach -}; +CFATTACH_DECL(com_mca, sizeof(struct com_mca_softc), + com_mca_probe, com_mca_attach, NULL, NULL) static const struct com_mca_product { u_int32_t cp_prodid; /* MCA product ID */ diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c index 2e5fe099434..dd122a601e6 100644 --- a/sys/dev/mca/ed_mca.c +++ b/sys/dev/mca/ed_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: ed_mca.c,v 1.15 2002/09/27 20:39:10 thorpej Exp $ */ +/* $NetBSD: ed_mca.c,v 1.16 2002/09/30 21:36:45 thorpej Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.15 2002/09/27 20:39:10 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.16 2002/09/30 21:36:45 thorpej Exp $"); #include "rnd.h" #include "locators.h" @@ -85,9 +85,8 @@ __KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.15 2002/09/27 20:39:10 thorpej Exp $"); static int ed_mca_probe __P((struct device *, struct cfdata *, void *)); static void ed_mca_attach __P((struct device *, struct device *, void *)); -const struct cfattach ed_mca_ca = { - sizeof(struct ed_softc), ed_mca_probe, ed_mca_attach -}; +CFATTACH_DECL(ed_mca, sizeof(struct ed_softc), + ed_mca_probe, ed_mca_attach, NULL, NULL) extern struct cfdriver ed_cd; diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c index 3ae3fe24c7f..1d9929836b1 100644 --- a/sys/dev/mca/edc_mca.c +++ b/sys/dev/mca/edc_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: edc_mca.c,v 1.18 2002/09/27 20:39:11 thorpej Exp $ */ +/* $NetBSD: edc_mca.c,v 1.19 2002/09/30 21:36:45 thorpej Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.18 2002/09/27 20:39:11 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.19 2002/09/30 21:36:45 thorpej Exp $"); #include "rnd.h" @@ -119,9 +119,8 @@ struct edc_mca_softc { int edc_mca_probe __P((struct device *, struct cfdata *, void *)); void edc_mca_attach __P((struct device *, struct device *, void *)); -const struct cfattach edc_mca_ca = { - sizeof(struct edc_mca_softc), edc_mca_probe, edc_mca_attach -}; +CFATTACH_DECL(edc_mca, sizeof(struct edc_mca_softc), + edc_mca_probe, edc_mca_attach, NULL, NULL) static int edc_intr __P((void *)); static void edc_dump_status_block __P((struct edc_mca_softc *, diff --git a/sys/dev/mca/esp_mca.c b/sys/dev/mca/esp_mca.c index e0aecb0e55b..04458e761c6 100644 --- a/sys/dev/mca/esp_mca.c +++ b/sys/dev/mca/esp_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp_mca.c,v 1.4 2002/09/27 20:39:12 thorpej Exp $ */ +/* $NetBSD: esp_mca.c,v 1.5 2002/09/30 21:36:45 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -93,10 +93,8 @@ static int esp_mca_debug = 0; static void esp_mca_attach __P((struct device *, struct device *, void *)); static int esp_mca_match __P((struct device *, struct cfdata *, void *)); -/* Linkup to the rest of the kernel */ -const struct cfattach esp_mca_ca = { - sizeof(struct esp_softc), esp_mca_match, esp_mca_attach -}; +CFATTACH_DECL(esp_mca, sizeof(struct esp_softc), + esp_mca_match, esp_mca_attach, NULL, NULL) /* * Functions and the switch for the MI code. diff --git a/sys/dev/mca/if_ate_mca.c b/sys/dev/mca/if_ate_mca.c index 7c4a9167efa..52cd1d3fd44 100644 --- a/sys/dev/mca/if_ate_mca.c +++ b/sys/dev/mca/if_ate_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ate_mca.c,v 1.5 2002/09/28 18:19:09 tsutsui Exp $ */ +/* $NetBSD: if_ate_mca.c,v 1.6 2002/09/30 21:36:45 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.5 2002/09/28 18:19:09 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.6 2002/09/30 21:36:45 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -77,9 +77,8 @@ struct ate_softc { void *sc_ih; /* interrupt cookie */ }; -const struct cfattach ate_mca_ca = { - sizeof(struct ate_softc), ate_mca_match, ate_mca_attach -}; +CFATTACH_DECL(ate_mca, sizeof(struct ate_softc), + ate_mca_match, ate_mca_attach, NULL, NULL) static const struct ate_mca_product { u_int32_t at_prodid; /* MCA product ID */ diff --git a/sys/dev/mca/if_elmc_mca.c b/sys/dev/mca/if_elmc_mca.c index 765e5572c08..d25602420d0 100644 --- a/sys/dev/mca/if_elmc_mca.c +++ b/sys/dev/mca/if_elmc_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_elmc_mca.c,v 1.9 2002/09/27 20:39:13 thorpej Exp $ */ +/* $NetBSD: if_elmc_mca.c,v 1.10 2002/09/30 21:36:45 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.9 2002/09/27 20:39:13 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.10 2002/09/30 21:36:45 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -441,6 +441,5 @@ elmc_mca_intrhook(sc, why) return (0); } -const struct cfattach elmc_mca_ca = { - sizeof(struct elmc_mca_softc), elmc_mca_match, elmc_mca_attach -}; +CFATTACH_DECL(elmc_mca, sizeof(struct elmc_mca_softc), + elmc_mca_match, elmc_mca_attach, NULL, NULL) diff --git a/sys/dev/mca/if_ep_mca.c b/sys/dev/mca/if_ep_mca.c index 08d281c6025..740425efbfe 100644 --- a/sys/dev/mca/if_ep_mca.c +++ b/sys/dev/mca/if_ep_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_mca.c,v 1.8 2002/09/27 20:39:14 thorpej Exp $ */ +/* $NetBSD: if_ep_mca.c,v 1.9 2002/09/30 21:36:45 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.8 2002/09/27 20:39:14 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.9 2002/09/30 21:36:45 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -109,9 +109,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.8 2002/09/27 20:39:14 thorpej Exp $" int ep_mca_match __P((struct device *, struct cfdata *, void *)); void ep_mca_attach __P((struct device *, struct device *, void *)); -const struct cfattach ep_mca_ca = { - sizeof(struct ep_softc), ep_mca_match, ep_mca_attach -}; +CFATTACH_DECL(ep_mca, sizeof(struct ep_softc), + ep_mca_match, ep_mca_attach, NULL, NULL) const struct ep_mca_product { u_int32_t epp_prodid; /* MCA product ID */ diff --git a/sys/dev/mca/if_le_mca.c b/sys/dev/mca/if_le_mca.c index 2305898e1b7..c8cc58e804d 100644 --- a/sys/dev/mca/if_le_mca.c +++ b/sys/dev/mca/if_le_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_mca.c,v 1.4 2002/09/27 20:39:15 thorpej Exp $ */ +/* $NetBSD: if_le_mca.c,v 1.5 2002/09/30 21:36:46 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.4 2002/09/27 20:39:15 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.5 2002/09/30 21:36:46 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -106,9 +106,8 @@ static __inline void le_mca_wrreg __P((struct le_mca_softc *, int, int)); #define le_mca_set_RAP(sc, reg_number) \ le_mca_wrreg(sc, reg_number, RAP | REGWRITE) -const struct cfattach le_mca_ca = { - sizeof(struct le_mca_softc), le_mca_match, le_mca_attach -}; +CFATTACH_DECL(le_mca, sizeof(struct le_mca_softc), + le_mca_match, le_mca_attach, NULL, NULL) /* SKNET MC+ POS mapping */ static const u_int8_t sknet_mcp_irq[] = { diff --git a/sys/dev/mca/if_ne_mca.c b/sys/dev/mca/if_ne_mca.c index 446a4b6e969..6146f12b7fe 100644 --- a/sys/dev/mca/if_ne_mca.c +++ b/sys/dev/mca/if_ne_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_mca.c,v 1.4 2002/09/27 20:39:15 thorpej Exp $ */ +/* $NetBSD: if_ne_mca.c,v 1.5 2002/09/30 21:36:46 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.4 2002/09/27 20:39:15 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.5 2002/09/30 21:36:46 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -86,9 +86,8 @@ struct ne_mca_softc { int ne_mca_match __P((struct device *, struct cfdata *, void *)); void ne_mca_attach __P((struct device *, struct device *, void *)); -const struct cfattach ne_mca_ca = { - sizeof(struct ne_mca_softc), ne_mca_match, ne_mca_attach -}; +CFATTACH_DECL(ne_mca, sizeof(struct ne_mca_softc), + ne_mca_match, ne_mca_attach, NULL, NULL) static const struct ne_mca_products { u_int32_t ne_id; diff --git a/sys/dev/mca/if_tr_mca.c b/sys/dev/mca/if_tr_mca.c index 5e4ec44153d..d309284d947 100644 --- a/sys/dev/mca/if_tr_mca.c +++ b/sys/dev/mca/if_tr_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tr_mca.c,v 1.8 2002/09/27 20:39:16 thorpej Exp $ */ +/* $NetBSD: if_tr_mca.c,v 1.9 2002/09/30 21:36:46 thorpej Exp $ */ /*_ * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.8 2002/09/27 20:39:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.9 2002/09/30 21:36:46 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,9 +70,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.8 2002/09/27 20:39:16 thorpej Exp $" int tr_mca_probe __P((struct device *, struct cfdata *, void *)); void tr_mca_attach __P((struct device *, struct device *, void *)); -const struct cfattach tr_mca_ca = { - sizeof(struct tr_softc), tr_mca_probe, tr_mca_attach -}; +CFATTACH_DECL(tr_mca, sizeof(struct tr_softc), + tr_mca_probe, tr_mca_attach, NULL, NULL) /* supported products */ static const struct tr_mca_product { diff --git a/sys/dev/mca/if_we_mca.c b/sys/dev/mca/if_we_mca.c index 6535f8f5985..6ffa37763a6 100644 --- a/sys/dev/mca/if_we_mca.c +++ b/sys/dev/mca/if_we_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_we_mca.c,v 1.6 2002/09/27 20:39:17 thorpej Exp $ */ +/* $NetBSD: if_we_mca.c,v 1.7 2002/09/30 21:36:46 thorpej Exp $ */ /*- * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.6 2002/09/27 20:39:17 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.7 2002/09/30 21:36:46 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -91,9 +91,8 @@ int we_mca_probe __P((struct device *, struct cfdata *, void *)); void we_mca_attach __P((struct device *, struct device *, void *)); void we_mca_init_hook __P((struct we_softc *)); -const struct cfattach we_mca_ca = { - sizeof(struct we_softc), we_mca_probe, we_mca_attach -}; +CFATTACH_DECL(we_mca, sizeof(struct we_softc), + we_mca_probe, we_mca_attach, NULL, NULL) /* * The types for some cards may not be correct; hopefully it's close diff --git a/sys/dev/mca/mca.c b/sys/dev/mca/mca.c index ac93dc0dda1..6ce5b5cb16b 100644 --- a/sys/dev/mca/mca.c +++ b/sys/dev/mca/mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: mca.c,v 1.10 2002/09/27 20:39:17 thorpej Exp $ */ +/* $NetBSD: mca.c,v 1.11 2002/09/30 21:36:46 thorpej Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.10 2002/09/27 20:39:17 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.11 2002/09/30 21:36:46 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,9 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.10 2002/09/27 20:39:17 thorpej Exp $"); int mca_match __P((struct device *, struct cfdata *, void *)); void mca_attach __P((struct device *, struct device *, void *)); -const struct cfattach mca_ca = { - sizeof(struct device), mca_match, mca_attach -}; +CFATTACH_DECL(mca, sizeof(struct device), + mca_match, mca_attach, NULL, NULL) int mca_submatch __P((struct device *, struct cfdata *, void *)); int mca_print __P((void *, const char *)); |
