diff options
| author | thorpej <thorpej@NetBSD.org> | 2002-09-30 23:07:07 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2002-09-30 23:07:07 +0000 |
| commit | 239b192ca3af72a869303c7ddf6ffe804afde227 (patch) | |
| tree | bf21175b4ce83b13f748fa3620686ffa4e340a20 /sys/dev | |
| parent | 71adb76f751fb48a8ab34db68ad3fc3ccd88988e (diff) | |
Use CFATTACH_DECL().
Diffstat (limited to 'sys/dev')
37 files changed, 163 insertions, 217 deletions
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c index 83239010c62..7a19099ee2c 100644 --- a/sys/dev/sbus/be.c +++ b/sys/dev/sbus/be.c @@ -1,4 +1,4 @@ -/* $NetBSD: be.c,v 1.35 2002/09/27 20:41:22 thorpej Exp $ */ +/* $NetBSD: be.c,v 1.36 2002/09/30 23:07:07 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.35 2002/09/27 20:41:22 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.36 2002/09/30 23:07:07 thorpej Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -216,9 +216,8 @@ void be_intphy_status __P((struct be_softc *)); int be_intphy_service __P((struct be_softc *, struct mii_data *, int)); -const struct cfattach be_ca = { - sizeof(struct be_softc), bematch, beattach -}; +CFATTACH_DECL(be, sizeof(struct be_softc), + bematch, beattach, NULL, NULL) int bematch(parent, cf, aux) diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c index 42ae1b0e3db..03588dc1cec 100644 --- a/sys/dev/sbus/bpp.c +++ b/sys/dev/sbus/bpp.c @@ -1,4 +1,4 @@ -/* $NetBSD: bpp.c,v 1.14 2002/09/27 20:41:23 thorpej Exp $ */ +/* $NetBSD: bpp.c,v 1.15 2002/09/30 23:07:07 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.14 2002/09/27 20:41:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.15 2002/09/30 23:07:07 thorpej Exp $"); #include <sys/param.h> #include <sys/ioctl.h> @@ -119,9 +119,8 @@ static void bppattach __P((struct device *, struct device *, void *)); static int bppintr __P((void *)); static void bpp_setparams __P((struct bpp_softc *, struct hwstate *)); -const struct cfattach bpp_ca = { - sizeof(struct bpp_softc), bppmatch, bppattach -}; +CFATTACH_DECL(bpp, sizeof(struct bpp_softc), + bppmatch, bppattach, NULL, NULL) extern struct cfdriver bpp_cd; diff --git a/sys/dev/sbus/bwtwo_sbus.c b/sys/dev/sbus/bwtwo_sbus.c index bd4bd9424b1..fa8a5855c62 100644 --- a/sys/dev/sbus/bwtwo_sbus.c +++ b/sys/dev/sbus/bwtwo_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: bwtwo_sbus.c,v 1.9 2002/09/27 20:41:24 thorpej Exp $ */ +/* $NetBSD: bwtwo_sbus.c,v 1.10 2002/09/30 23:07:07 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.9 2002/09/27 20:41:24 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.10 2002/09/30 23:07:07 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -123,9 +123,8 @@ struct bwtwo_sbus_softc { struct sbusdev bss_sd; }; -const struct cfattach bwtwo_sbus_ca = { - sizeof(struct bwtwo_sbus_softc), bwtwomatch_sbus, bwtwoattach_sbus -}; +CFATTACH_DECL(bwtwo_sbus, sizeof(struct bwtwo_sbus_softc), + bwtwomatch_sbus, bwtwoattach_sbus, NULL, NULL) static int bwtwo_get_video (struct bwtwo_softc *); static void bwtwo_set_video (struct bwtwo_softc *, int); diff --git a/sys/dev/sbus/cgsix_sbus.c b/sys/dev/sbus/cgsix_sbus.c index 89b5ab43b8c..0f0d56f4c0c 100644 --- a/sys/dev/sbus/cgsix_sbus.c +++ b/sys/dev/sbus/cgsix_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgsix_sbus.c,v 1.10 2002/09/27 20:41:24 thorpej Exp $ */ +/* $NetBSD: cgsix_sbus.c,v 1.11 2002/09/30 23:07:07 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.10 2002/09/27 20:41:24 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.11 2002/09/30 23:07:07 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -80,10 +80,8 @@ struct cgsix_sbus_softc { struct sbusdev bss_sd; }; -const struct cfattach cgsix_sbus_ca = { - sizeof(struct cgsix_sbus_softc), cgsixmatch, cgsixattach -}; - +CFATTACH_DECL(cgsix_sbus, sizeof(struct cgsix_sbus_softc), + cgsixmatch, cgsixattach, NULL, NULL) /* * Match a cgsix. diff --git a/sys/dev/sbus/cgthree_sbus.c b/sys/dev/sbus/cgthree_sbus.c index cca0664351d..094a6f2a605 100644 --- a/sys/dev/sbus/cgthree_sbus.c +++ b/sys/dev/sbus/cgthree_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgthree_sbus.c,v 1.9 2002/09/27 20:41:25 thorpej Exp $ */ +/* $NetBSD: cgthree_sbus.c,v 1.10 2002/09/30 23:07:07 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -89,7 +89,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.9 2002/09/27 20:41:25 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.10 2002/09/30 23:07:07 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -125,10 +125,8 @@ struct cgthree_sbus_softc { static int cgthreematch_sbus(struct device *, struct cfdata *, void *); static void cgthreeattach_sbus(struct device *, struct device *, void *); -const struct cfattach cgthree_sbus_ca = { - sizeof(struct cgthree_softc), cgthreematch_sbus, cgthreeattach_sbus -}; - +CFATTACH_DECL(cgthree_sbus, sizeof(struct cgthree_softc), + cgthreematch_sbus, cgthreeattach_sbus, NULL, NULL) /* * Match a cgthree. diff --git a/sys/dev/sbus/cs4231_sbus.c b/sys/dev/sbus/cs4231_sbus.c index 23d6fb5b396..1cb5bd5934a 100644 --- a/sys/dev/sbus/cs4231_sbus.c +++ b/sys/dev/sbus/cs4231_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4231_sbus.c,v 1.22 2002/09/27 20:41:25 thorpej Exp $ */ +/* $NetBSD: cs4231_sbus.c,v 1.23 2002/09/30 23:07:07 thorpej Exp $ */ /*- * Copyright (c) 1998, 1999, 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.22 2002/09/27 20:41:25 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.23 2002/09/30 23:07:07 thorpej Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -88,11 +88,8 @@ struct cs4231_sbus_softc { static int cs4231_sbus_match(struct device *, struct cfdata *, void *); static void cs4231_sbus_attach(struct device *, struct device *, void *); -const struct cfattach audiocs_sbus_ca = { - sizeof(struct cs4231_sbus_softc), cs4231_sbus_match, cs4231_sbus_attach -}; - - +CFATTACH_DECL(audiocs_sbus, sizeof(struct cs4231_sbus_softc), + cs4231_sbus_match, cs4231_sbus_attach, NULL, NULL) /* audio_hw_if methods specific to apc dma */ static int cs4231_sbus_trigger_output(void *, void *, void *, int, diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c index 4ec23da976c..3034310a6e6 100644 --- a/sys/dev/sbus/dma_sbus.c +++ b/sys/dev/sbus/dma_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: dma_sbus.c,v 1.14 2002/09/27 20:41:26 thorpej Exp $ */ +/* $NetBSD: dma_sbus.c,v 1.15 2002/09/30 23:07:07 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.14 2002/09/27 20:41:26 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.15 2002/09/30 23:07:07 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -111,13 +111,11 @@ void *dmabus_intr_establish __P(( static bus_space_tag_t dma_alloc_bustag __P((struct dma_softc *sc)); -const struct cfattach dma_sbus_ca = { - sizeof(struct dma_softc), dmamatch_sbus, dmaattach_sbus -}; +CFATTACH_DECL(dma_sbus, sizeof(struct dma_softc), + dmamatch_sbus, dmaattach_sbus, NULL, NULL) -const struct cfattach ledma_ca = { - sizeof(struct dma_softc), dmamatch_sbus, dmaattach_sbus -}; +CFATTACH_DECL(ledma, sizeof(struct dma_softc), + dmamatch_sbus, dmaattach_sbus, NULL, NULL) int dmaprint_sbus(aux, busname) diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c index ced9bd04b88..5a7e997984f 100644 --- a/sys/dev/sbus/esp_sbus.c +++ b/sys/dev/sbus/esp_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp_sbus.c,v 1.24 2002/09/27 20:41:27 thorpej Exp $ */ +/* $NetBSD: esp_sbus.c,v 1.25 2002/09/30 23:07:07 thorpej Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.24 2002/09/27 20:41:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.25 2002/09/30 23:07:07 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -83,13 +83,11 @@ void espattach_dma __P((struct device *, struct device *, void *)); int espmatch_sbus __P((struct device *, struct cfdata *, void *)); -/* Linkup to the rest of the kernel */ -const struct cfattach esp_sbus_ca = { - sizeof(struct esp_softc), espmatch_sbus, espattach_sbus -}; -const struct cfattach esp_dma_ca = { - sizeof(struct esp_softc), espmatch_sbus, espattach_dma -}; +CFATTACH_DECL(esp_sbus, sizeof(struct esp_softc), + espmatch_sbus, espattach_sbus, NULL, NULL) + +CFATTACH_DECL(esp_dma, sizeof(struct esp_softc), + espmatch_sbus, espattach_dma, NULL, NULL) /* * Functions and the switch for the MI code. diff --git a/sys/dev/sbus/if_en.c b/sys/dev/sbus/if_en.c index 44f54721b44..5fdd0470ff3 100644 --- a/sys/dev/sbus/if_en.c +++ b/sys/dev/sbus/if_en.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_en.c,v 1.15 2002/09/27 20:41:28 thorpej Exp $ */ +/* $NetBSD: if_en.c,v 1.16 2002/09/30 23:07:08 thorpej Exp $ */ /* * @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.15 2002/09/27 20:41:28 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.16 2002/09/30 23:07:08 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -86,9 +86,8 @@ static void en_sbus_attach __P((struct device *, struct device *, void *)); * SBus autoconfig attachments */ -const struct cfattach en_sbus_ca = { - sizeof(struct en_sbus_softc), en_sbus_match, en_sbus_attach, -}; +CFATTACH_DECL(en_sbus, sizeof(struct en_sbus_softc), + en_sbus_match, en_sbus_attach, NULL, NULL) /***********************************************************************/ diff --git a/sys/dev/sbus/if_hme_sbus.c b/sys/dev/sbus/if_hme_sbus.c index ce9b6be9f16..6eaad5d3132 100644 --- a/sys/dev/sbus/if_hme_sbus.c +++ b/sys/dev/sbus/if_hme_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_hme_sbus.c,v 1.14 2002/09/27 20:41:28 thorpej Exp $ */ +/* $NetBSD: if_hme_sbus.c,v 1.15 2002/09/30 23:07:08 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.14 2002/09/27 20:41:28 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.15 2002/09/30 23:07:08 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,9 +73,8 @@ struct hmesbus_softc { int hmematch_sbus __P((struct device *, struct cfdata *, void *)); void hmeattach_sbus __P((struct device *, struct device *, void *)); -const struct cfattach hme_sbus_ca = { - sizeof(struct hmesbus_softc), hmematch_sbus, hmeattach_sbus -}; +CFATTACH_DECL(hme_sbus, sizeof(struct hmesbus_softc), + hmematch_sbus, hmeattach_sbus, NULL, NULL) int hmematch_sbus(parent, cf, aux) diff --git a/sys/dev/sbus/if_le.c b/sys/dev/sbus/if_le.c index 79412f11b60..85a5fc76c5d 100644 --- a/sys/dev/sbus/if_le.c +++ b/sys/dev/sbus/if_le.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le.c,v 1.24 2002/09/27 20:41:29 thorpej Exp $ */ +/* $NetBSD: if_le.c,v 1.25 2002/09/30 23:07:08 thorpej Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.24 2002/09/27 20:41:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.25 2002/09/30 23:07:08 thorpej Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -95,9 +95,8 @@ static int lemedia[] = { }; #define NLEMEDIA (sizeof(lemedia) / sizeof(lemedia[0])) -const struct cfattach le_sbus_ca = { - sizeof(struct le_softc), lematch_sbus, leattach_sbus -}; +CFATTACH_DECL(le_sbus, sizeof(struct le_softc), + lematch_sbus, leattach_sbus, NULL, NULL) extern struct cfdriver le_cd; diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c index f2c5e296050..0abcd426644 100644 --- a/sys/dev/sbus/if_le_lebuffer.c +++ b/sys/dev/sbus/if_le_lebuffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_lebuffer.c,v 1.13 2002/09/27 20:41:29 thorpej Exp $ */ +/* $NetBSD: if_le_lebuffer.c,v 1.14 2002/09/30 23:07:08 thorpej Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.13 2002/09/27 20:41:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.14 2002/09/30 23:07:08 thorpej Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -98,9 +98,8 @@ static int lemedia[] = { }; #define NLEMEDIA (sizeof(lemedia) / sizeof(lemedia[0])) -const struct cfattach le_lebuffer_ca = { - sizeof(struct le_softc), lematch_lebuffer, leattach_lebuffer -}; +CFATTACH_DECL(le_lebuffer, sizeof(struct le_softc), + lematch_lebuffer, leattach_lebuffer, NULL, NULL) extern struct cfdriver le_cd; diff --git a/sys/dev/sbus/if_le_ledma.c b/sys/dev/sbus/if_le_ledma.c index 06a93573fa0..d2ffb914a8b 100644 --- a/sys/dev/sbus/if_le_ledma.c +++ b/sys/dev/sbus/if_le_ledma.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_ledma.c,v 1.19 2002/09/27 20:41:30 thorpej Exp $ */ +/* $NetBSD: if_le_ledma.c,v 1.20 2002/09/30 23:07:08 thorpej Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.19 2002/09/27 20:41:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.20 2002/09/30 23:07:08 thorpej Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -111,9 +111,8 @@ void lesetaui __P((struct lance_softc *)); int lemediachange __P((struct lance_softc *)); void lemediastatus __P((struct lance_softc *, struct ifmediareq *)); -const struct cfattach le_ledma_ca = { - sizeof(struct le_softc), lematch_ledma, leattach_ledma -}; +CFATTACH_DECL(le_ledma, sizeof(struct le_softc), + lematch_ledma, leattach_ledma, NULL, NULL) extern struct cfdriver le_cd; diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c index 4f038cd5ef8..146974faf63 100644 --- a/sys/dev/sbus/isp_sbus.c +++ b/sys/dev/sbus/isp_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: isp_sbus.c,v 1.56 2002/09/27 20:41:30 thorpej Exp $ */ +/* $NetBSD: isp_sbus.c,v 1.57 2002/09/30 23:07:08 thorpej Exp $ */ /* * This driver, which is contained in NetBSD in the files: * @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.56 2002/09/27 20:41:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.57 2002/09/30 23:07:08 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -118,9 +118,8 @@ struct isp_sbussoftc { static int isp_match(struct device *, struct cfdata *, void *); static void isp_sbus_attach(struct device *, struct device *, void *); -const struct cfattach isp_sbus_ca = { - sizeof (struct isp_sbussoftc), isp_match, isp_sbus_attach -}; +CFATTACH_DECL(isp_sbus, sizeof (struct isp_sbussoftc), + isp_match, isp_sbus_attach, NULL, NULL) static int isp_match(struct device *parent, struct cfdata *cf, void *aux) diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c index e18f3dbfc61..3268d1f98b7 100644 --- a/sys/dev/sbus/lebuffer.c +++ b/sys/dev/sbus/lebuffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: lebuffer.c,v 1.15 2002/09/27 20:41:32 thorpej Exp $ */ +/* $NetBSD: lebuffer.c,v 1.16 2002/09/30 23:07:08 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.15 2002/09/27 20:41:32 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.16 2002/09/30 23:07:08 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,9 +57,8 @@ int lebufprint __P((void *, const char *)); int lebufmatch __P((struct device *, struct cfdata *, void *)); void lebufattach __P((struct device *, struct device *, void *)); -const struct cfattach lebuffer_ca = { - sizeof(struct lebuf_softc), lebufmatch, lebufattach -}; +CFATTACH_DECL(lebuffer, sizeof(struct lebuf_softc), + lebufmatch, lebufattach) int lebufprint(aux, busname) diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c index 5e54a08bca4..29359aac5c8 100644 --- a/sys/dev/sbus/magma.c +++ b/sys/dev/sbus/magma.c @@ -1,4 +1,4 @@ -/* $NetBSD: magma.c,v 1.18 2002/09/27 20:41:32 thorpej Exp $ */ +/* $NetBSD: magma.c,v 1.19 2002/09/30 23:07:08 thorpej Exp $ */ /* * magma.c * @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.18 2002/09/27 20:41:32 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.19 2002/09/30 23:07:08 thorpej Exp $"); #if 0 #define MAGMA_DEBUG @@ -186,17 +186,14 @@ static struct magma_board_info supported_cards[] = { * Autoconfig Stuff */ -const struct cfattach magma_ca = { - sizeof(struct magma_softc), magma_match, magma_attach -}; +CFATTACH_DECL(magma, sizeof(struct magma_softc), + magma_match, magma_attach, NULL, NULL) -const struct cfattach mtty_ca = { - sizeof(struct mtty_softc), mtty_match, mtty_attach -}; +CFATTACH_DECL(mtty, sizeof(struct mtty_softc), + mtty_match, mtty_attach, NULL, NULL) -const struct cfattach mbpp_ca = { - sizeof(struct mbpp_softc), mbpp_match, mbpp_attach -}; +CFATTACH_DECL(mbpp, sizeof(struct mbpp_softc), + mbpp_match, mbpp_attach, NULL, NULL) extern struct cfdriver mtty_cd; extern struct cfdriver mbpp_cd; diff --git a/sys/dev/sbus/p9100.c b/sys/dev/sbus/p9100.c index 5c2bfe44c87..5fa4bec4517 100644 --- a/sys/dev/sbus/p9100.c +++ b/sys/dev/sbus/p9100.c @@ -1,4 +1,4 @@ -/* $NetBSD: p9100.c,v 1.11 2002/09/27 20:41:33 thorpej Exp $ */ +/* $NetBSD: p9100.c,v 1.12 2002/09/30 23:07:08 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.11 2002/09/27 20:41:33 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.12 2002/09/30 23:07:08 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -122,9 +122,8 @@ static void p9100_sbus_attach(struct device *, struct device *, void *); static void p9100unblank(struct device *); static void p9100_shutdown(void *); -const struct cfattach pnozz_ca = { - sizeof(struct p9100_softc), p9100_sbus_match, p9100_sbus_attach -}; +CFATTACH_DECL(pnozz, sizeof(struct p9100_softc), + p9100_sbus_match, p9100_sbus_attach, NULL, NULL) extern struct cfdriver pnozz_cd; diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c index a0a97dfbd11..f6b18bc89c6 100644 --- a/sys/dev/sbus/qe.c +++ b/sys/dev/sbus/qe.c @@ -1,4 +1,4 @@ -/* $NetBSD: qe.c,v 1.26 2002/09/27 20:41:33 thorpej Exp $ */ +/* $NetBSD: qe.c,v 1.27 2002/09/30 23:07:08 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.26 2002/09/27 20:41:33 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.27 2002/09/30 23:07:08 thorpej Exp $"); #define QEDEBUG @@ -187,9 +187,8 @@ static struct mbuf *qe_get __P((struct qe_softc *, int, int)); void qe_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); int qe_ifmedia_upd __P((struct ifnet *)); -const struct cfattach qe_ca = { - sizeof(struct qe_softc), qematch, qeattach -}; +CFATTACH_DECL(qe, sizeof(struct qe_softc), + qematch, qeattach, NULL, NULL) int qematch(parent, cf, aux) diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c index 45e42a2130c..2d8e179cd64 100644 --- a/sys/dev/sbus/qec.c +++ b/sys/dev/sbus/qec.c @@ -1,4 +1,4 @@ -/* $NetBSD: qec.c,v 1.22 2002/09/27 20:41:34 thorpej Exp $ */ +/* $NetBSD: qec.c,v 1.23 2002/09/30 23:07:08 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.22 2002/09/27 20:41:34 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.23 2002/09/30 23:07:08 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,9 +74,8 @@ static void *qec_intr_establish __P(( int (*) __P((void *)), /*handler*/ void *)); /*arg*/ -const struct cfattach qec_ca = { - sizeof(struct qec_softc), qecmatch, qecattach -}; +CFATTACH_DECL(qec, sizeof(struct qec_softc), + qecmatch, qecattach, NULL, NULL) int qecprint(aux, busname) diff --git a/sys/dev/sbus/sio16.c b/sys/dev/sbus/sio16.c index b92a52cd514..a1ce21b2816 100644 --- a/sys/dev/sbus/sio16.c +++ b/sys/dev/sbus/sio16.c @@ -1,4 +1,4 @@ -/* $NetBSD: sio16.c,v 1.8 2002/09/27 20:41:35 thorpej Exp $ */ +/* $NetBSD: sio16.c,v 1.9 2002/09/30 23:07:08 thorpej Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.8 2002/09/27 20:41:35 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.9 2002/09/30 23:07:08 thorpej Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -91,9 +91,8 @@ struct sio16_softc { }; -const struct cfattach siosixteen_ca = { - sizeof(struct sio16_softc), sio16_match, sio16_attach -}; +CFATTACH_DECL(siosixteen, sizeof(struct sio16_softc), + sio16_match, sio16_attach, NULL, NULL) struct sio16_attach_args { bus_space_tag_t cd_tag; @@ -281,9 +280,8 @@ sio16_ackfunc(v, who) static int clcd_match(struct device *, struct cfdata *, void *); static void clcd_attach(struct device *, struct device *, void *); -const struct cfattach clcd_ca = { - sizeof(struct cd18xx_softc), clcd_match, clcd_attach -}; +CFATTACH_DECL(clcd, sizeof(struct cd18xx_softc), + clcd_match, clcd_attach, NULL, NULL) static int clcd_match(parent, cf, aux) diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c index 0c1eec3a297..b6dd9d000ed 100644 --- a/sys/dev/sbus/stp4020.c +++ b/sys/dev/sbus/stp4020.c @@ -1,4 +1,4 @@ -/* $NetBSD: stp4020.c,v 1.25 2002/09/27 20:41:36 thorpej Exp $ */ +/* $NetBSD: stp4020.c,v 1.26 2002/09/30 23:07:08 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.25 2002/09/27 20:41:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.26 2002/09/30 23:07:08 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -139,9 +139,8 @@ static int stp4020_statintr __P((void *)); static void stp4020_map_window(struct stp4020_socket *h, int win, int speed); static void stp4020_calc_speed(int bus_speed, int ns, int *length, int *delay); -const struct cfattach nell_ca = { - sizeof(struct stp4020_softc), stp4020match, stp4020attach -}; +CFATTACH_DECL(nell, sizeof(struct stp4020_softc), + stp4020match, stp4020attach, NULL, NULL) #ifdef STP4020_DEBUG static void stp4020_dump_regs __P((struct stp4020_socket *)); diff --git a/sys/dev/sbus/tcx.c b/sys/dev/sbus/tcx.c index c6079e8c7df..7f0f2212b4b 100644 --- a/sys/dev/sbus/tcx.c +++ b/sys/dev/sbus/tcx.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcx.c,v 1.10 2002/09/27 20:41:37 thorpej Exp $ */ +/* $NetBSD: tcx.c,v 1.11 2002/09/30 23:07:09 thorpej Exp $ */ /* * Copyright (c) 1996,1998 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.10 2002/09/27 20:41:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.11 2002/09/30 23:07:09 thorpej Exp $"); /* * define for cg8 emulation on S24 (24-bit version of tcx) for the SS5; @@ -117,9 +117,8 @@ static void tcxattach __P((struct device *, struct device *, void *)); static int tcxmatch __P((struct device *, struct cfdata *, void *)); static void tcx_unblank __P((struct device *)); -const struct cfattach tcx_ca = { - sizeof(struct tcx_softc), tcxmatch, tcxattach -}; +CFATTACH_DECL(tcx, sizeof(struct tcx_softc), + tcxmatch, tcxattach, NULL, NULL) extern struct cfdriver tcx_cd; diff --git a/sys/dev/sbus/xbox.c b/sys/dev/sbus/xbox.c index 1cc2597890b..df817899bd1 100644 --- a/sys/dev/sbus/xbox.c +++ b/sys/dev/sbus/xbox.c @@ -1,4 +1,4 @@ -/* $NetBSD: xbox.c,v 1.7 2002/09/27 20:41:38 thorpej Exp $ */ +/* $NetBSD: xbox.c,v 1.8 2002/09/30 23:07:09 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.7 2002/09/27 20:41:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.8 2002/09/30 23:07:09 thorpej Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -102,9 +102,8 @@ int xbox_match __P((struct device *, struct cfdata *, void *)); void xbox_attach __P((struct device *, struct device *, void *)); int xbox_print __P(( void *, const char *)); -const struct cfattach xbox_ca = { - sizeof(struct xbox_softc), xbox_match, xbox_attach -}; +CFATTACH_DECL(xbox, sizeof(struct xbox_softc), + xbox_match, xbox_attach, NULL, NULL) int xbox_print(args, busname) diff --git a/sys/dev/sbus/zx.c b/sys/dev/sbus/zx.c index e425bd82dc4..51f5ff8c87e 100644 --- a/sys/dev/sbus/zx.c +++ b/sys/dev/sbus/zx.c @@ -1,4 +1,4 @@ -/* $NetBSD: zx.c,v 1.3 2002/09/27 20:41:38 thorpej Exp $ */ +/* $NetBSD: zx.c,v 1.4 2002/09/30 23:07:09 thorpej Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.3 2002/09/27 20:41:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.4 2002/09/30 23:07:09 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -134,9 +134,8 @@ struct zx_mmo { { ZX_LD_GBL_VOFF, ZX_OFF_LD_GBL, 0x00001000 }, }; -const struct cfattach zx_ca = { - sizeof(struct zx_softc), zx_match, zx_attach -}; +CFATTACH_DECL(zx, sizeof(struct zx_softc), + zx_match, zx_attach, NULL, NULL) extern struct cfdriver zx_cd; diff --git a/sys/dev/scsipi/atapiconf.c b/sys/dev/scsipi/atapiconf.c index 951c7f7277e..095376d964f 100644 --- a/sys/dev/scsipi/atapiconf.c +++ b/sys/dev/scsipi/atapiconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: atapiconf.c,v 1.51 2002/09/27 20:41:39 thorpej Exp $ */ +/* $NetBSD: atapiconf.c,v 1.52 2002/09/30 23:12:50 thorpej Exp $ */ /* * Copyright (c) 1996, 2001 Manuel Bouyer. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.51 2002/09/27 20:41:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.52 2002/09/30 23:12:50 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,10 +65,8 @@ int atapibussubmatch __P((struct device *, struct cfdata *, void *)); int atapi_probe_bus __P((struct atapibus_softc *, int)); -const struct cfattach atapibus_ca = { - sizeof(struct atapibus_softc), atapibusmatch, atapibusattach, - atapibusdetach, atapibusactivate, -}; +CFATTACH_DECL(atapibus, sizeof(struct atapibus_softc), + atapibusmatch, atapibusattach, atapibusdetach, atapibusactivate) extern struct cfdriver atapibus_cd; diff --git a/sys/dev/scsipi/cd_atapi.c b/sys/dev/scsipi/cd_atapi.c index 55ee6db36a2..af88ceef946 100644 --- a/sys/dev/scsipi/cd_atapi.c +++ b/sys/dev/scsipi/cd_atapi.c @@ -1,4 +1,4 @@ -/* $NetBSD: cd_atapi.c,v 1.21 2002/09/27 20:41:40 thorpej Exp $ */ +/* $NetBSD: cd_atapi.c,v 1.22 2002/09/30 23:12:50 thorpej Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd_atapi.c,v 1.21 2002/09/27 20:41:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd_atapi.c,v 1.22 2002/09/30 23:12:50 thorpej Exp $"); #include "rnd.h" @@ -73,10 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: cd_atapi.c,v 1.21 2002/09/27 20:41:40 thorpej Exp $" int cd_atapibus_match __P((struct device *, struct cfdata *, void *)); void cd_atapibus_attach __P((struct device *, struct device *, void *)); -const struct cfattach cd_atapibus_ca = { - sizeof(struct cd_softc), cd_atapibus_match, cd_atapibus_attach, - cddetach, cdactivate -}; +CFATTACH_DECL(cd_atapibus, sizeof(struct cd_softc), + cd_atapibus_match, cd_atapibus_attach, cddetach, cdactivate) struct scsipi_inquiry_pattern cd_atapibus_patterns[] = { {T_CDROM, T_REMOV, diff --git a/sys/dev/scsipi/cd_scsi.c b/sys/dev/scsipi/cd_scsi.c index e92aa3b07e1..08c5b123d0b 100644 --- a/sys/dev/scsipi/cd_scsi.c +++ b/sys/dev/scsipi/cd_scsi.c @@ -1,4 +1,4 @@ -/* $NetBSD: cd_scsi.c,v 1.24 2002/09/27 20:41:41 thorpej Exp $ */ +/* $NetBSD: cd_scsi.c,v 1.25 2002/09/30 23:12:51 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd_scsi.c,v 1.24 2002/09/27 20:41:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd_scsi.c,v 1.25 2002/09/30 23:12:51 thorpej Exp $"); #include "rnd.h" @@ -81,11 +81,8 @@ __KERNEL_RCSID(0, "$NetBSD: cd_scsi.c,v 1.24 2002/09/27 20:41:41 thorpej Exp $") int cd_scsibus_match __P((struct device *, struct cfdata *, void *)); void cd_scsibus_attach __P((struct device *, struct device *, void *)); -const struct cfattach cd_scsibus_ca = { - sizeof(struct cd_softc), cd_scsibus_match, cd_scsibus_attach, - cddetach, cdactivate -}; - +CFATTACH_DECL(cd_scsibus, sizeof(struct cd_softc), + cd_scsibus_match, cd_scsibus_attach, cddetach, cdactivate) struct scsipi_inquiry_pattern cd_scsibus_patterns[] = { {T_CDROM, T_REMOV, diff --git a/sys/dev/scsipi/ch.c b/sys/dev/scsipi/ch.c index 3d9f466a0c2..3220c5f5c2b 100644 --- a/sys/dev/scsipi/ch.c +++ b/sys/dev/scsipi/ch.c @@ -1,4 +1,4 @@ -/* $NetBSD: ch.c,v 1.51 2002/09/27 20:41:42 thorpej Exp $ */ +/* $NetBSD: ch.c,v 1.52 2002/09/30 23:12:51 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.51 2002/09/27 20:41:42 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.52 2002/09/30 23:12:51 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -109,9 +109,8 @@ struct ch_softc { int chmatch __P((struct device *, struct cfdata *, void *)); void chattach __P((struct device *, struct device *, void *)); -const struct cfattach ch_ca = { - sizeof(struct ch_softc), chmatch, chattach -}; +CFATTACH_DECL(ch, sizeof(struct ch_softc), + chmatch, chattach, NULL, NULL) extern struct cfdriver ch_cd; diff --git a/sys/dev/scsipi/if_se.c b/sys/dev/scsipi/if_se.c index 7258aaba6c8..290c43c1e6b 100644 --- a/sys/dev/scsipi/if_se.c +++ b/sys/dev/scsipi/if_se.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_se.c,v 1.41 2002/09/27 20:41:44 thorpej Exp $ */ +/* $NetBSD: if_se.c,v 1.42 2002/09/30 23:12:51 thorpej Exp $ */ /* * Copyright (c) 1997 Ian W. Dall <ian.dall@dsto.defence.gov.au> @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.41 2002/09/27 20:41:44 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.42 2002/09/30 23:12:51 thorpej Exp $"); #include "opt_inet.h" #include "opt_atalk.h" @@ -242,9 +242,8 @@ static int se_set_mode(struct se_softc *, int, int); int se_enable __P((struct se_softc *)); void se_disable __P((struct se_softc *)); -const struct cfattach se_ca = { - sizeof(struct se_softc), sematch, seattach -}; +CFATTACH_DECL(se, sizeof(struct se_softc), + sematch, seattach, NULL, NULL) extern struct cfdriver se_cd; diff --git a/sys/dev/scsipi/scsiconf.c b/sys/dev/scsipi/scsiconf.c index 3b325790cdc..d4e02025d5f 100644 --- a/sys/dev/scsipi/scsiconf.c +++ b/sys/dev/scsipi/scsiconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: scsiconf.c,v 1.190 2002/09/27 20:41:45 thorpej Exp $ */ +/* $NetBSD: scsiconf.c,v 1.191 2002/09/30 23:12:51 thorpej Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.190 2002/09/27 20:41:45 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.191 2002/09/30 23:12:51 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -101,10 +101,8 @@ int scsibusdetach __P((struct device *, int flags)); int scsibussubmatch __P((struct device *, struct cfdata *, void *)); -const struct cfattach scsibus_ca = { - sizeof(struct scsibus_softc), scsibusmatch, scsibusattach, - scsibusdetach, scsibusactivate, -}; +CFATTACH_DECL(scsibus, sizeof(struct scsibus_softc), + scsibusmatch, scsibusattach, scsibusdetach, scsibusactivate) extern struct cfdriver scsibus_cd; diff --git a/sys/dev/scsipi/sd_atapi.c b/sys/dev/scsipi/sd_atapi.c index 56cb1638e92..e54d0df971b 100644 --- a/sys/dev/scsipi/sd_atapi.c +++ b/sys/dev/scsipi/sd_atapi.c @@ -1,4 +1,4 @@ -/* $NetBSD: sd_atapi.c,v 1.15 2002/09/27 20:41:46 thorpej Exp $ */ +/* $NetBSD: sd_atapi.c,v 1.16 2002/09/30 23:12:52 thorpej Exp $ */ /* * Copyright 1998 @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sd_atapi.c,v 1.15 2002/09/27 20:41:46 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sd_atapi.c,v 1.16 2002/09/30 23:12:52 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,10 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: sd_atapi.c,v 1.15 2002/09/27 20:41:46 thorpej Exp $" int sd_atapibus_match __P((struct device *, struct cfdata *, void *)); void sd_atapibus_attach __P((struct device *, struct device *, void *)); -const struct cfattach sd_atapibus_ca = { - sizeof(struct sd_softc), sd_atapibus_match, sd_atapibus_attach, - sddetach, sdactivate, -}; +CFATTACH_DECL(sd_atapibus, sizeof(struct sd_softc), + sd_atapibus_match, sd_atapibus_attach, sddetach, sdactivate) struct scsipi_inquiry_pattern sd_atapibus_patterns[] = { {T_DIRECT, T_FIXED, /* do these exist? */ diff --git a/sys/dev/scsipi/sd_scsi.c b/sys/dev/scsipi/sd_scsi.c index 3d3d02b9143..951f1a96c26 100644 --- a/sys/dev/scsipi/sd_scsi.c +++ b/sys/dev/scsipi/sd_scsi.c @@ -1,4 +1,4 @@ -/* $NetBSD: sd_scsi.c,v 1.23 2002/09/27 20:41:47 thorpej Exp $ */ +/* $NetBSD: sd_scsi.c,v 1.24 2002/09/30 23:12:52 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sd_scsi.c,v 1.23 2002/09/27 20:41:47 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sd_scsi.c,v 1.24 2002/09/30 23:12:52 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,10 +76,8 @@ __KERNEL_RCSID(0, "$NetBSD: sd_scsi.c,v 1.23 2002/09/27 20:41:47 thorpej Exp $") int sd_scsibus_match __P((struct device *, struct cfdata *, void *)); void sd_scsibus_attach __P((struct device *, struct device *, void *)); -const struct cfattach sd_scsibus_ca = { - sizeof(struct sd_softc), sd_scsibus_match, sd_scsibus_attach, - sddetach, sdactivate, -}; +CFATTACH_DECL(sd_scsibus, sizeof(struct sd_softc), + sd_scsibus_match, sd_scsibus_attach, sddetach, sdactivate) struct scsipi_inquiry_pattern sd_scsibus_patterns[] = { {T_DIRECT, T_FIXED, diff --git a/sys/dev/scsipi/ses.c b/sys/dev/scsipi/ses.c index 07c08dc60bd..8e7360e7caa 100644 --- a/sys/dev/scsipi/ses.c +++ b/sys/dev/scsipi/ses.c @@ -1,4 +1,4 @@ -/* $NetBSD: ses.c,v 1.15 2002/09/27 20:41:48 thorpej Exp $ */ +/* $NetBSD: ses.c,v 1.16 2002/09/30 23:12:52 thorpej Exp $ */ /* * Copyright (C) 2000 National Aeronautics & Space Administration * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.15 2002/09/27 20:41:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.16 2002/09/30 23:12:52 thorpej Exp $"); #include "opt_scsi.h" @@ -170,9 +170,9 @@ static int ses_match __P((struct device *, struct cfdata *, void *)); static void ses_attach __P((struct device *, struct device *, void *)); static enctyp ses_device_type __P((struct scsipibus_attach_args *)); -const struct cfattach ses_ca = { - sizeof (struct ses_softc), ses_match, ses_attach -}; +CFATTACH_DECL(ses, sizeof (struct ses_softc), + ses_match, ses_attach, NULL, NULL) + extern struct cfdriver ses_cd; const struct scsipi_periphsw ses_switch = { diff --git a/sys/dev/scsipi/ss.c b/sys/dev/scsipi/ss.c index abe6f196b81..3bbf84552fd 100644 --- a/sys/dev/scsipi/ss.c +++ b/sys/dev/scsipi/ss.c @@ -1,4 +1,4 @@ -/* $NetBSD: ss.c,v 1.42 2002/09/27 20:41:49 thorpej Exp $ */ +/* $NetBSD: ss.c,v 1.43 2002/09/30 23:12:52 thorpej Exp $ */ /* * Copyright (c) 1995 Kenneth Stailey. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.42 2002/09/27 20:41:49 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.43 2002/09/30 23:12:52 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,9 +73,8 @@ void ssattach(struct device *, struct device *, void *); int ssdetach(struct device *self, int flags); int ssactivate(struct device *self, enum devact act); -const struct cfattach ss_ca = { - sizeof(struct ss_softc), ssmatch, ssattach, ssdetach, ssactivate -}; +CFATTACH_DECL(ss, sizeof(struct ss_softc), + ssmatch, ssattach, ssdetach, ssactivate) extern struct cfdriver ss_cd; diff --git a/sys/dev/scsipi/st_atapi.c b/sys/dev/scsipi/st_atapi.c index f6f327f242b..d78b71a1002 100644 --- a/sys/dev/scsipi/st_atapi.c +++ b/sys/dev/scsipi/st_atapi.c @@ -1,4 +1,4 @@ -/* $NetBSD: st_atapi.c,v 1.9 2002/09/27 20:41:49 thorpej Exp $ */ +/* $NetBSD: st_atapi.c,v 1.10 2002/09/30 23:12:52 thorpej Exp $ */ /* * Copyright (c) 2001 Manuel Bouyer. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.9 2002/09/27 20:41:49 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.10 2002/09/30 23:12:52 thorpej Exp $"); #include "opt_scsi.h" #include "rnd.h" @@ -54,10 +54,8 @@ int st_atapibus_mode_sense __P((struct st_softc *, int)); int st_atapibus_mode_select __P((struct st_softc *, int)); int st_atapibus_do_ms __P((struct st_softc *, int, void *, int, int)); -const struct cfattach st_atapibus_ca = { - sizeof(struct st_softc), st_atapibus_match, st_atapibus_attach, - stdetach, stactivate -}; +CFATTACH_DECL(st_atapibus, sizeof(struct st_softc), + st_atapibus_match, st_atapibus_attach, stdetach, stactivate) const struct scsipi_inquiry_pattern st_atapibus_patterns[] = { {T_SEQUENTIAL, T_REMOV, diff --git a/sys/dev/scsipi/st_scsi.c b/sys/dev/scsipi/st_scsi.c index 8fbcab263b0..adf38c68e02 100644 --- a/sys/dev/scsipi/st_scsi.c +++ b/sys/dev/scsipi/st_scsi.c @@ -1,4 +1,4 @@ -/* $NetBSD: st_scsi.c,v 1.8 2002/09/27 20:41:50 thorpej Exp $ */ +/* $NetBSD: st_scsi.c,v 1.9 2002/09/30 23:12:52 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.8 2002/09/27 20:41:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.9 2002/09/30 23:12:52 thorpej Exp $"); #include "opt_scsi.h" #include "rnd.h" @@ -81,10 +81,8 @@ int st_scsibus_mode_sense __P((struct st_softc *, int)); int st_scsibus_mode_select __P((struct st_softc *, int)); int st_scsibus_cmprss __P((struct st_softc *, int, int)); -const struct cfattach st_scsibus_ca = { - sizeof(struct st_softc), st_scsibus_match, st_scsibus_attach, - stdetach, stactivate -}; +CFATTACH_DECL(st_scsibus, sizeof(struct st_softc), + st_scsibus_match, st_scsibus_attach, stdetach, stactivate) const struct scsipi_inquiry_pattern st_scsibus_patterns[] = { {T_SEQUENTIAL, T_REMOV, diff --git a/sys/dev/scsipi/uk.c b/sys/dev/scsipi/uk.c index 5221eef5675..dc2e226dc7c 100644 --- a/sys/dev/scsipi/uk.c +++ b/sys/dev/scsipi/uk.c @@ -1,4 +1,4 @@ -/* $NetBSD: uk.c,v 1.35 2002/09/27 20:41:50 thorpej Exp $ */ +/* $NetBSD: uk.c,v 1.36 2002/09/30 23:12:52 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.35 2002/09/27 20:41:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.36 2002/09/30 23:12:52 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,12 +71,11 @@ int ukactivate __P((struct device *, enum devact)); int ukdetach __P((struct device *, int)); -const struct cfattach uk_scsibus_ca = { - sizeof(struct uk_softc), ukmatch, ukattach, ukdetach, ukactivate, -}; -const struct cfattach uk_atapibus_ca = { - sizeof(struct uk_softc), ukmatch, ukattach, ukdetach, ukactivate, -}; +CFATTACH_DECL(uk_scsibus, sizeof(struct uk_softc), + ukmatch, ukattach, ukdetach, ukactivate) + +CFATTACH_DECL(uk_atapibus, sizeof(struct uk_softc), + ukmatch, ukattach, ukdetach, ukactivate) extern struct cfdriver uk_cd; |
