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/mca | |
| parent | e9d707fbd5eb3e9e8b02741357fd5ed7071107e6 (diff) | |
Use CFATTACH_DECL().
Diffstat (limited to 'sys/dev/mca')
| -rw-r--r-- | sys/dev/mca/aha_mca.c | 10 | ||||
| -rw-r--r-- | sys/dev/mca/com_mca.c | 9 | ||||
| -rw-r--r-- | sys/dev/mca/ed_mca.c | 9 | ||||
| -rw-r--r-- | sys/dev/mca/edc_mca.c | 9 | ||||
| -rw-r--r-- | sys/dev/mca/esp_mca.c | 8 | ||||
| -rw-r--r-- | sys/dev/mca/if_ate_mca.c | 9 | ||||
| -rw-r--r-- | sys/dev/mca/if_elmc_mca.c | 9 | ||||
| -rw-r--r-- | sys/dev/mca/if_ep_mca.c | 9 | ||||
| -rw-r--r-- | sys/dev/mca/if_le_mca.c | 9 | ||||
| -rw-r--r-- | sys/dev/mca/if_ne_mca.c | 9 | ||||
| -rw-r--r-- | sys/dev/mca/if_tr_mca.c | 9 | ||||
| -rw-r--r-- | sys/dev/mca/if_we_mca.c | 9 | ||||
| -rw-r--r-- | sys/dev/mca/mca.c | 9 |
13 files changed, 51 insertions, 66 deletions
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 *)); |
