summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2002-09-30 21:57:46 +0000
committerthorpej <thorpej@NetBSD.org>2002-09-30 21:57:46 +0000
commit71adb76f751fb48a8ab34db68ad3fc3ccd88988e (patch)
treec317f186d2ee8977b7b1bab1f5de8b7ea5beaca0 /sys/dev
parent9bb77522c10734edbc8215c601d0c400a515285c (diff)
Use CFATTACH_DECL().
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/mii/acphy.c10
-rw-r--r--sys/dev/mii/amhphy.c10
-rw-r--r--sys/dev/mii/bmtphy.c10
-rw-r--r--sys/dev/mii/brgphy.c10
-rw-r--r--sys/dev/mii/dmphy.c10
-rw-r--r--sys/dev/mii/exphy.c10
-rw-r--r--sys/dev/mii/gentbi.c10
-rw-r--r--sys/dev/mii/glxtphy.c10
-rw-r--r--sys/dev/mii/gphyter.c10
-rw-r--r--sys/dev/mii/icsphy.c10
-rw-r--r--sys/dev/mii/inphy.c10
-rw-r--r--sys/dev/mii/iophy.c10
-rw-r--r--sys/dev/mii/lxtphy.c10
-rw-r--r--sys/dev/mii/makphy.c10
-rw-r--r--sys/dev/mii/nsphy.c10
-rw-r--r--sys/dev/mii/nsphyter.c10
-rw-r--r--sys/dev/mii/pnaphy.c10
-rw-r--r--sys/dev/mii/qsphy.c10
-rw-r--r--sys/dev/mii/sqphy.c10
-rw-r--r--sys/dev/mii/tlphy.c10
-rw-r--r--sys/dev/mii/tqphy.c10
-rw-r--r--sys/dev/mii/ukphy.c10
-rw-r--r--sys/dev/mii/urlphy.c10
-rw-r--r--sys/dev/mscp/mscp_disk.c14
-rw-r--r--sys/dev/mscp/mscp_subr.c9
-rw-r--r--sys/dev/mscp/mscp_tape.c9
-rw-r--r--sys/dev/mvme/clmpcc_pcctwo.c7
-rw-r--r--sys/dev/mvme/clock_pcctwo.c7
-rw-r--r--sys/dev/mvme/if_ie_mvme.c7
-rw-r--r--sys/dev/mvme/lpt_pcctwo.c7
-rw-r--r--sys/dev/mvme/osiop_pcctwo.c8
-rw-r--r--sys/dev/ofisa/com_ofisa.c9
-rw-r--r--sys/dev/ofisa/ess_ofisa.c9
-rw-r--r--sys/dev/ofisa/if_cs_ofisa.c9
-rw-r--r--sys/dev/ofisa/joy_ofisa.c9
-rw-r--r--sys/dev/ofisa/lpt_ofisa.c9
-rw-r--r--sys/dev/ofisa/ofisa.c9
-rw-r--r--sys/dev/ofisa/pckbc_ofisa.c9
-rw-r--r--sys/dev/ofisa/sb_ofisa.c9
-rw-r--r--sys/dev/ofisa/wdc_ofisa.c9
-rw-r--r--sys/dev/ofw/ofbus.c9
-rw-r--r--sys/dev/ofw/ofcons.c9
-rw-r--r--sys/dev/ofw/ofdisk.c9
-rw-r--r--sys/dev/ofw/ofnet.c9
-rw-r--r--sys/dev/ofw/ofrtc.c9
-rw-r--r--sys/dev/pckbc/pckbd.c9
-rw-r--r--sys/dev/pckbc/pms.c9
-rw-r--r--sys/dev/pcmcia/aic_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/com_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/esl_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/esp_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/fdc_pcmcia.c9
-rw-r--r--sys/dev/pcmcia/if_an_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_awi_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_cnw.c11
-rw-r--r--sys/dev/pcmcia/if_cs_pcmcia.c13
-rw-r--r--sys/dev/pcmcia/if_ep_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_mbe_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_ne_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_ray.c11
-rw-r--r--sys/dev/pcmcia/if_sm_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_tr_pcmcia.c13
-rw-r--r--sys/dev/pcmcia/if_wi_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_xi.c13
-rw-r--r--sys/dev/pcmcia/isic_pcmcia.c9
-rw-r--r--sys/dev/pcmcia/mhzc.c22
-rw-r--r--sys/dev/pcmcia/nca_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/opl_esl.c10
-rw-r--r--sys/dev/pcmcia/pcmcia.c9
-rw-r--r--sys/dev/pcmcia/pcmcom.c16
-rw-r--r--sys/dev/pcmcia/wdc_pcmcia.c10
-rw-r--r--sys/dev/podulebus/acemidi.c14
-rw-r--r--sys/dev/podulebus/dtide.c9
-rw-r--r--sys/dev/podulebus/hcide.c9
-rw-r--r--sys/dev/podulebus/hcsc.c9
-rw-r--r--sys/dev/podulebus/if_ea.c9
-rw-r--r--sys/dev/podulebus/if_eb.c9
-rw-r--r--sys/dev/podulebus/if_ei.c9
-rw-r--r--sys/dev/podulebus/oak.c9
-rw-r--r--sys/dev/qbus/dhu.c9
-rw-r--r--sys/dev/qbus/dl.c9
-rw-r--r--sys/dev/qbus/dz_uba.c9
-rw-r--r--sys/dev/qbus/if_de.c9
-rw-r--r--sys/dev/qbus/if_dmc.c9
-rw-r--r--sys/dev/qbus/if_il.c9
-rw-r--r--sys/dev/qbus/if_qe.c9
-rw-r--r--sys/dev/qbus/qd.c9
-rw-r--r--sys/dev/qbus/rl.c14
-rw-r--r--sys/dev/qbus/ts.c9
-rw-r--r--sys/dev/qbus/uda.c14
90 files changed, 369 insertions, 525 deletions
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index e3e704aaf15..b09a5c5d638 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acphy.c,v 1.8 2002/09/27 20:39:18 thorpej Exp $ */
+/* $NetBSD: acphy.c,v 1.9 2002/09/30 21:57:46 thorpej Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.8 2002/09/27 20:39:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.9 2002/09/30 21:57:46 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,10 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.8 2002/09/27 20:39:18 thorpej Exp $");
int acphymatch(struct device *, struct cfdata *, void *);
void acphyattach(struct device *, struct device *, void *);
-const struct cfattach acphy_ca = {
- sizeof(struct mii_softc), acphymatch, acphyattach,
- mii_phy_detach, mii_phy_activate
-};
+CFATTACH_DECL(acphy, sizeof(struct mii_softc),
+ acphymatch, acphyattach, mii_phy_detach, mii_phy_activate)
int acphy_service(struct mii_softc *, struct mii_data *, int);
void acphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/amhphy.c b/sys/dev/mii/amhphy.c
index ebd4e59801d..d11efb9e26b 100644
--- a/sys/dev/mii/amhphy.c
+++ b/sys/dev/mii/amhphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amhphy.c,v 1.6 2002/09/27 20:39:18 thorpej Exp $ */
+/* $NetBSD: amhphy.c,v 1.7 2002/09/30 21:57:46 thorpej Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amhphy.c,v 1.6 2002/09/27 20:39:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amhphy.c,v 1.7 2002/09/30 21:57:46 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,10 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: amhphy.c,v 1.6 2002/09/27 20:39:18 thorpej Exp $");
int amhphymatch(struct device *, struct cfdata *, void *);
void amhphyattach(struct device *, struct device *, void *);
-const struct cfattach amhphy_ca = {
- sizeof(struct mii_softc), amhphymatch, amhphyattach,
- mii_phy_detach, mii_phy_activate
-};
+CFATTACH_DECL(amhphy, sizeof(struct mii_softc),
+ amhphymatch, amhphyattach, mii_phy_detach, mii_phy_activate)
int amhphy_service(struct mii_softc *, struct mii_data *, int);
void amhphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index b70dc9aacee..ef24873c2f2 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bmtphy.c,v 1.9 2002/09/27 20:39:19 thorpej Exp $ */
+/* $NetBSD: bmtphy.c,v 1.10 2002/09/30 21:57:46 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.9 2002/09/27 20:39:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.10 2002/09/30 21:57:46 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,10 +94,8 @@ __KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.9 2002/09/27 20:39:19 thorpej Exp $");
int bmtphymatch(struct device *, struct cfdata *, void *);
void bmtphyattach(struct device *, struct device *, void *);
-const struct cfattach bmtphy_ca = {
- sizeof(struct mii_softc), bmtphymatch, bmtphyattach,
- mii_phy_detach, mii_phy_activate
-};
+CFATTACH_DECL(bmtphy, sizeof(struct mii_softc),
+ bmtphymatch, bmtphyattach, mii_phy_detach, mii_phy_activate)
int bmtphy_service(struct mii_softc *, struct mii_data *, int);
void bmtphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 58187a841d8..25894ed3e10 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.11 2002/09/27 20:39:19 thorpej Exp $ */
+/* $NetBSD: brgphy.c,v 1.12 2002/09/30 21:57:46 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.11 2002/09/27 20:39:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.12 2002/09/30 21:57:46 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,10 +95,8 @@ __KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.11 2002/09/27 20:39:19 thorpej Exp $");
int brgphymatch(struct device *, struct cfdata *, void *);
void brgphyattach(struct device *, struct device *, void *);
-const struct cfattach brgphy_ca = {
- sizeof(struct mii_softc), brgphymatch, brgphyattach,
- mii_phy_detach, mii_phy_activate
-};
+CFATTACH_DECL(brgphy, sizeof(struct mii_softc),
+ brgphymatch, brgphyattach, mii_phy_detach, mii_phy_activate)
int brgphy_service(struct mii_softc *, struct mii_data *, int);
void brgphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/dmphy.c b/sys/dev/mii/dmphy.c
index 71ef69c2b60..b855c24a9d5 100644
--- a/sys/dev/mii/dmphy.c
+++ b/sys/dev/mii/dmphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmphy.c,v 1.15 2002/09/27 20:39:20 thorpej Exp $ */
+/* $NetBSD: dmphy.c,v 1.16 2002/09/30 21:57:47 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.15 2002/09/27 20:39:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.16 2002/09/30 21:57:47 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,10 +93,8 @@ __KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.15 2002/09/27 20:39:20 thorpej Exp $");
int dmphymatch(struct device *, struct cfdata *, void *);
void dmphyattach(struct device *, struct device *, void *);
-const struct cfattach dmphy_ca = {
- sizeof(struct mii_softc), dmphymatch, dmphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(dmphy, sizeof(struct mii_softc),
+ dmphymatch, dmphyattach, mii_phy_detach, mii_phy_activate)
int dmphy_service(struct mii_softc *, struct mii_data *, int);
void dmphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 3913dbe404c..fc92c887b42 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exphy.c,v 1.32 2002/09/27 20:39:20 thorpej Exp $ */
+/* $NetBSD: exphy.c,v 1.33 2002/09/30 21:57:47 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.32 2002/09/27 20:39:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.33 2002/09/30 21:57:47 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,10 +89,8 @@ __KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.32 2002/09/27 20:39:20 thorpej Exp $");
int exphymatch(struct device *, struct cfdata *, void *);
void exphyattach(struct device *, struct device *, void *);
-const struct cfattach exphy_ca = {
- sizeof(struct mii_softc), exphymatch, exphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(exphy, sizeof(struct mii_softc),
+ exphymatch, exphyattach, mii_phy_detach, mii_phy_activate)
int exphy_service(struct mii_softc *, struct mii_data *, int);
void exphy_reset(struct mii_softc *);
diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index 112ca6e7598..00b57e307a9 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gentbi.c,v 1.7 2002/09/27 20:39:20 thorpej Exp $ */
+/* $NetBSD: gentbi.c,v 1.8 2002/09/30 21:57:47 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gentbi.c,v 1.7 2002/09/27 20:39:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gentbi.c,v 1.8 2002/09/30 21:57:47 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,10 +93,8 @@ __KERNEL_RCSID(0, "$NetBSD: gentbi.c,v 1.7 2002/09/27 20:39:20 thorpej Exp $");
int gentbimatch(struct device *, struct cfdata *, void *);
void gentbiattach(struct device *, struct device *, void *);
-const struct cfattach gentbi_ca = {
- sizeof(struct mii_softc), gentbimatch, gentbiattach,
- mii_phy_detach, mii_phy_activate
-};
+CFATTACH_DECL(gentbi, sizeof(struct mii_softc),
+ gentbimatch, gentbiattach, mii_phy_detach, mii_phy_activate)
int gentbi_service(struct mii_softc *, struct mii_data *, int);
void gentbi_status(struct mii_softc *);
diff --git a/sys/dev/mii/glxtphy.c b/sys/dev/mii/glxtphy.c
index 74911c9ff1b..4c5a78a00bf 100644
--- a/sys/dev/mii/glxtphy.c
+++ b/sys/dev/mii/glxtphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: glxtphy.c,v 1.6 2002/09/27 20:39:21 thorpej Exp $ */
+/* $NetBSD: glxtphy.c,v 1.7 2002/09/30 21:57:47 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.6 2002/09/27 20:39:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.7 2002/09/30 21:57:47 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,10 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.6 2002/09/27 20:39:21 thorpej Exp $");
int glxtphymatch(struct device *, struct cfdata *, void *);
void glxtphyattach(struct device *, struct device *, void *);
-const struct cfattach glxtphy_ca = {
- sizeof(struct mii_softc), glxtphymatch, glxtphyattach,
- mii_phy_detach, mii_phy_activate
-};
+CFATTACH_DECL(glxtphy, sizeof(struct mii_softc),
+ glxtphymatch, glxtphyattach, mii_phy_detach, mii_phy_activate)
int glxtphy_service(struct mii_softc *, struct mii_data *, int);
void glxtphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/gphyter.c b/sys/dev/mii/gphyter.c
index 288b2ca91de..8d91c271727 100644
--- a/sys/dev/mii/gphyter.c
+++ b/sys/dev/mii/gphyter.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gphyter.c,v 1.9 2002/09/27 20:39:21 thorpej Exp $ */
+/* $NetBSD: gphyter.c,v 1.10 2002/09/30 21:57:47 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gphyter.c,v 1.9 2002/09/27 20:39:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gphyter.c,v 1.10 2002/09/30 21:57:47 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -96,10 +96,8 @@ __KERNEL_RCSID(0, "$NetBSD: gphyter.c,v 1.9 2002/09/27 20:39:21 thorpej Exp $");
int gphytermatch(struct device *, struct cfdata *, void *);
void gphyterattach(struct device *, struct device *, void *);
-const struct cfattach gphyter_ca = {
- sizeof(struct mii_softc), gphytermatch, gphyterattach,
- mii_phy_detach, mii_phy_activate
-};
+CFATTACH_DECL(gphyter, sizeof(struct mii_softc),
+ gphytermatch, gphyterattach, mii_phy_detach, mii_phy_activate)
int gphyter_service(struct mii_softc *, struct mii_data *, int);
void gphyter_status(struct mii_softc *);
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index 8f926c119f7..3dc88bd8b15 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icsphy.c,v 1.28 2002/09/27 20:39:21 thorpej Exp $ */
+/* $NetBSD: icsphy.c,v 1.29 2002/09/30 21:57:48 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icsphy.c,v 1.28 2002/09/27 20:39:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icsphy.c,v 1.29 2002/09/30 21:57:48 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,10 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: icsphy.c,v 1.28 2002/09/27 20:39:21 thorpej Exp $");
int icsphymatch(struct device *, struct cfdata *, void *);
void icsphyattach(struct device *, struct device *, void *);
-const struct cfattach icsphy_ca = {
- sizeof(struct mii_softc), icsphymatch, icsphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(icsphy, sizeof(struct mii_softc),
+ icsphymatch, icsphyattach, mii_phy_detach, mii_phy_activate)
int icsphy_service(struct mii_softc *, struct mii_data *, int);
void icsphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index bcd63004e3d..a8a26a7d6df 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inphy.c,v 1.29 2002/09/27 20:39:22 thorpej Exp $ */
+/* $NetBSD: inphy.c,v 1.30 2002/09/30 21:57:48 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.29 2002/09/27 20:39:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.30 2002/09/30 21:57:48 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,10 +93,8 @@ __KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.29 2002/09/27 20:39:22 thorpej Exp $");
int inphymatch(struct device *, struct cfdata *, void *);
void inphyattach(struct device *, struct device *, void *);
-const struct cfattach inphy_ca = {
- sizeof(struct mii_softc), inphymatch, inphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(inphy, sizeof(struct mii_softc),
+ inphymatch, inphyattach, mii_phy_detach, mii_phy_activate)
int inphy_service(struct mii_softc *, struct mii_data *, int);
void inphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/iophy.c b/sys/dev/mii/iophy.c
index a6292a4af2b..3c5868e6120 100644
--- a/sys/dev/mii/iophy.c
+++ b/sys/dev/mii/iophy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iophy.c,v 1.18 2002/09/27 20:39:22 thorpej Exp $ */
+/* $NetBSD: iophy.c,v 1.19 2002/09/30 21:57:48 thorpej Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iophy.c,v 1.18 2002/09/27 20:39:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iophy.c,v 1.19 2002/09/30 21:57:48 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,10 +91,8 @@ __KERNEL_RCSID(0, "$NetBSD: iophy.c,v 1.18 2002/09/27 20:39:22 thorpej Exp $");
int iophymatch(struct device *, struct cfdata *, void *);
void iophyattach(struct device *, struct device *, void *);
-const struct cfattach iophy_ca = {
- sizeof(struct mii_softc), iophymatch, iophyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(iophy, sizeof(struct mii_softc),
+ iophymatch, iophyattach, mii_phy_detach, mii_phy_activate)
int iophy_service(struct mii_softc *, struct mii_data *, int);
void iophy_status(struct mii_softc *);
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index faa64383486..bec29ba1dd1 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lxtphy.c,v 1.30 2002/09/27 20:39:23 thorpej Exp $ */
+/* $NetBSD: lxtphy.c,v 1.31 2002/09/30 21:57:48 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.30 2002/09/27 20:39:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.31 2002/09/30 21:57:48 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,10 +93,8 @@ __KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.30 2002/09/27 20:39:23 thorpej Exp $");
int lxtphymatch(struct device *, struct cfdata *, void *);
void lxtphyattach(struct device *, struct device *, void *);
-const struct cfattach lxtphy_ca = {
- sizeof(struct mii_softc), lxtphymatch, lxtphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(lxtphy, sizeof(struct mii_softc),
+ lxtphymatch, lxtphyattach, mii_phy_detach, mii_phy_activate)
int lxtphy_service(struct mii_softc *, struct mii_data *, int);
void lxtphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/makphy.c b/sys/dev/mii/makphy.c
index a69b102ea68..233dea3fe8e 100644
--- a/sys/dev/mii/makphy.c
+++ b/sys/dev/mii/makphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.9 2002/09/27 20:39:23 thorpej Exp $ */
+/* $NetBSD: makphy.c,v 1.10 2002/09/30 21:57:49 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.9 2002/09/27 20:39:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.10 2002/09/30 21:57:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,10 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.9 2002/09/27 20:39:23 thorpej Exp $");
int makphymatch(struct device *, struct cfdata *, void *);
void makphyattach(struct device *, struct device *, void *);
-const struct cfattach makphy_ca = {
- sizeof(struct mii_softc), makphymatch, makphyattach,
- mii_phy_detach, mii_phy_activate
-};
+CFATTACH_DECL(makphy, sizeof(struct mii_softc),
+ makphymatch, makphyattach, mii_phy_detach, mii_phy_activate)
int makphy_service(struct mii_softc *, struct mii_data *, int);
void makphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 46ee161c1f2..5d24c305ddc 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsphy.c,v 1.36 2002/09/27 20:39:24 thorpej Exp $ */
+/* $NetBSD: nsphy.c,v 1.37 2002/09/30 21:57:49 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.36 2002/09/27 20:39:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.37 2002/09/30 21:57:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,10 +93,8 @@ __KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.36 2002/09/27 20:39:24 thorpej Exp $");
int nsphymatch(struct device *, struct cfdata *, void *);
void nsphyattach(struct device *, struct device *, void *);
-const struct cfattach nsphy_ca = {
- sizeof(struct mii_softc), nsphymatch, nsphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(nsphy, sizeof(struct mii_softc),
+ nsphymatch, nsphyattach, mii_phy_detach, mii_phy_activate)
int nsphy_service(struct mii_softc *, struct mii_data *, int);
void nsphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index 9888760bf02..40972aa8aa0 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsphyter.c,v 1.16 2002/09/27 20:39:24 thorpej Exp $ */
+/* $NetBSD: nsphyter.c,v 1.17 2002/09/30 21:57:49 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.16 2002/09/27 20:39:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.17 2002/09/30 21:57:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -96,10 +96,8 @@ __KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.16 2002/09/27 20:39:24 thorpej Exp $"
int nsphytermatch(struct device *, struct cfdata *, void *);
void nsphyterattach(struct device *, struct device *, void *);
-const struct cfattach nsphyter_ca = {
- sizeof(struct mii_softc), nsphytermatch, nsphyterattach,
- mii_phy_detach, mii_phy_activate
-};
+CFATTACH_DECL(nsphyter, sizeof(struct mii_softc),
+ nsphytermatch, nsphyterattach, mii_phy_detach, mii_phy_activate)
int nsphyter_service(struct mii_softc *, struct mii_data *, int);
void nsphyter_status(struct mii_softc *);
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index 525ddef985c..1951f4806a8 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pnaphy.c,v 1.6 2002/09/27 20:39:25 thorpej Exp $ */
+/* $NetBSD: pnaphy.c,v 1.7 2002/09/30 21:57:49 thorpej Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnaphy.c,v 1.6 2002/09/27 20:39:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnaphy.c,v 1.7 2002/09/30 21:57:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,10 +66,8 @@ __KERNEL_RCSID(0, "$NetBSD: pnaphy.c,v 1.6 2002/09/27 20:39:25 thorpej Exp $");
int pnaphymatch(struct device *, struct cfdata *, void *);
void pnaphyattach(struct device *, struct device *, void *);
-const struct cfattach pnaphy_ca = {
- sizeof(struct mii_softc), pnaphymatch, pnaphyattach,
- mii_phy_detach, mii_phy_activate
-};
+CFATTACH_DECL(pnaphy, sizeof(struct mii_softc),
+ pnaphymatch, pnaphyattach, mii_phy_detach, mii_phy_activate)
int pnaphy_service(struct mii_softc *, struct mii_data *, int);
void pnaphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 01bf972a55e..d1cb55dd721 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qsphy.c,v 1.29 2002/09/27 20:39:25 thorpej Exp $ */
+/* $NetBSD: qsphy.c,v 1.30 2002/09/30 21:57:49 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qsphy.c,v 1.29 2002/09/27 20:39:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qsphy.c,v 1.30 2002/09/30 21:57:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,10 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: qsphy.c,v 1.29 2002/09/27 20:39:25 thorpej Exp $");
int qsphymatch(struct device *, struct cfdata *, void *);
void qsphyattach(struct device *, struct device *, void *);
-const struct cfattach qsphy_ca = {
- sizeof(struct mii_softc), qsphymatch, qsphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(qsphy, sizeof(struct mii_softc),
+ qsphymatch, qsphyattach, mii_phy_detach, mii_phy_activate)
int qsphy_service(struct mii_softc *, struct mii_data *, int);
void qsphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/sqphy.c b/sys/dev/mii/sqphy.c
index 9b972a915fb..83dceffb98d 100644
--- a/sys/dev/mii/sqphy.c
+++ b/sys/dev/mii/sqphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sqphy.c,v 1.31 2002/09/28 19:07:43 thorpej Exp $ */
+/* $NetBSD: sqphy.c,v 1.32 2002/09/30 21:57:50 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sqphy.c,v 1.31 2002/09/28 19:07:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sqphy.c,v 1.32 2002/09/30 21:57:50 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,10 +93,8 @@ __KERNEL_RCSID(0, "$NetBSD: sqphy.c,v 1.31 2002/09/28 19:07:43 thorpej Exp $");
int sqphymatch(struct device *, struct cfdata *, void *);
void sqphyattach(struct device *, struct device *, void *);
-const struct cfattach sqphy_ca = {
- sizeof(struct mii_softc), sqphymatch, sqphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(sqphy, sizeof(struct mii_softc),
+ sqphymatch, sqphyattach, mii_phy_detach, mii_phy_activate)
int sqphy_service(struct mii_softc *, struct mii_data *, int);
void sqphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index 9751d87fdd7..26b7bee6f5b 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tlphy.c,v 1.35 2002/09/27 20:39:26 thorpej Exp $ */
+/* $NetBSD: tlphy.c,v 1.36 2002/09/30 21:57:50 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.35 2002/09/27 20:39:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.36 2002/09/30 21:57:50 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,10 +108,8 @@ struct tlphy_softc {
int tlphymatch(struct device *, struct cfdata *, void *);
void tlphyattach(struct device *, struct device *, void *);
-const struct cfattach tlphy_ca = {
- sizeof(struct tlphy_softc), tlphymatch, tlphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(tlphy, sizeof(struct tlphy_softc),
+ tlphymatch, tlphyattach, mii_phy_detach, mii_phy_activate)
int tlphy_service(struct mii_softc *, struct mii_data *, int);
int tlphy_auto(struct tlphy_softc *, int);
diff --git a/sys/dev/mii/tqphy.c b/sys/dev/mii/tqphy.c
index bd7b1442589..23e28414f26 100644
--- a/sys/dev/mii/tqphy.c
+++ b/sys/dev/mii/tqphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tqphy.c,v 1.20 2002/09/27 20:39:27 thorpej Exp $ */
+/* $NetBSD: tqphy.c,v 1.21 2002/09/30 21:57:50 thorpej Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tqphy.c,v 1.20 2002/09/27 20:39:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tqphy.c,v 1.21 2002/09/30 21:57:50 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,10 +93,8 @@ __KERNEL_RCSID(0, "$NetBSD: tqphy.c,v 1.20 2002/09/27 20:39:27 thorpej Exp $");
int tqphymatch(struct device *, struct cfdata *, void *);
void tqphyattach(struct device *, struct device *, void *);
-const struct cfattach tqphy_ca = {
- sizeof(struct mii_softc), tqphymatch, tqphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(tqphy, sizeof(struct mii_softc),
+ tqphymatch, tqphyattach, mii_phy_detach, mii_phy_activate)
int tqphy_service(struct mii_softc *, struct mii_data *, int);
void tqphy_status(struct mii_softc *);
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 8390d60482c..9e1f97b3801 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ukphy.c,v 1.20 2002/09/27 20:39:27 thorpej Exp $ */
+/* $NetBSD: ukphy.c,v 1.21 2002/09/30 21:57:50 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.20 2002/09/27 20:39:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.21 2002/09/30 21:57:50 thorpej Exp $");
#include "opt_mii.h"
@@ -101,10 +101,8 @@ struct mii_knowndev {
int ukphymatch(struct device *, struct cfdata *, void *);
void ukphyattach(struct device *, struct device *, void *);
-const struct cfattach ukphy_ca = {
- sizeof(struct mii_softc), ukphymatch, ukphyattach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(ukphy, sizeof(struct mii_softc),
+ ukphymatch, ukphyattach, mii_phy_detach, mii_phy_activate)
int ukphy_service(struct mii_softc *, struct mii_data *, int);
diff --git a/sys/dev/mii/urlphy.c b/sys/dev/mii/urlphy.c
index 2a311ab6779..a41d01eafd9 100644
--- a/sys/dev/mii/urlphy.c
+++ b/sys/dev/mii/urlphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: urlphy.c,v 1.4 2002/09/27 20:39:27 thorpej Exp $ */
+/* $NetBSD: urlphy.c,v 1.5 2002/09/30 21:57:51 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.4 2002/09/27 20:39:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.5 2002/09/30 21:57:51 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,10 +66,8 @@ int urlphydebug = URLPHY_DEBUG;
int urlphy_match(struct device *, struct cfdata *, void *);
void urlphy_attach(struct device *, struct device *, void *);
-const struct cfattach urlphy_ca = {
- sizeof(struct mii_softc), urlphy_match, urlphy_attach, mii_phy_detach,
- mii_phy_activate
-};
+CFATTACH_DECL(urlphy, sizeof(struct mii_softc),
+ urlphy_match, urlphy_attach, mii_phy_detach, mii_phy_activate)
int urlphy_service(struct mii_softc *, struct mii_data *, int);
void urlphy_status(struct mii_softc *);
diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c
index 3c0f94c38ff..13ecc215b7f 100644
--- a/sys/dev/mscp/mscp_disk.c
+++ b/sys/dev/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.34 2002/09/27 20:39:28 thorpej Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.35 2002/09/30 21:59:29 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.34 2002/09/27 20:39:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.35 2002/09/30 21:59:29 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -103,9 +103,8 @@ int ramatch __P((struct device *, struct cfdata *, void *));
void raattach __P((struct device *, struct device *, void *));
int ra_putonline __P((struct ra_softc *));
-const struct cfattach ra_ca = {
- sizeof(struct ra_softc), ramatch, rxattach
-};
+CFATTACH_DECL(ra, sizeof(struct ra_softc),
+ ramatch, rxattach, NULL, NULL)
dev_type_open(raopen);
dev_type_close(raclose);
@@ -521,9 +520,8 @@ rasize(dev)
int rxmatch __P((struct device *, struct cfdata *, void *));
-const struct cfattach rx_ca = {
- sizeof(struct rx_softc), rxmatch, rxattach
-};
+CFATTACH_DECL(rx, sizeof(struct rx_softc),
+ rxmatch, rxattach, NULL, NULL)
dev_type_open(rxopen);
dev_type_read(rxread);
diff --git a/sys/dev/mscp/mscp_subr.c b/sys/dev/mscp/mscp_subr.c
index bc28b0818f8..f95af64ea4a 100644
--- a/sys/dev/mscp/mscp_subr.c
+++ b/sys/dev/mscp/mscp_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_subr.c,v 1.20 2002/09/27 20:39:29 thorpej Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.21 2002/09/30 21:59:30 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.20 2002/09/27 20:39:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.21 2002/09/30 21:59:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -70,9 +70,8 @@ int mscp_init __P((struct mscp_softc *));
void mscp_initds __P((struct mscp_softc *));
int mscp_waitstep __P((struct mscp_softc *, int, int));
-const struct cfattach mscpbus_ca = {
- sizeof(struct mscp_softc), mscp_match, mscp_attach
-};
+CFATTACH_DECL(mscpbus, sizeof(struct mscp_softc),
+ mscp_match, mscp_attach, NULL, NULL)
#define READ_SA (bus_space_read_2(mi->mi_iot, mi->mi_sah, 0))
#define READ_IP (bus_space_read_2(mi->mi_iot, mi->mi_iph, 0))
diff --git a/sys/dev/mscp/mscp_tape.c b/sys/dev/mscp/mscp_tape.c
index 5341c1e7ca4..47e78f1ff15 100644
--- a/sys/dev/mscp/mscp_tape.c
+++ b/sys/dev/mscp/mscp_tape.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_tape.c,v 1.18 2002/09/27 20:39:29 thorpej Exp $ */
+/* $NetBSD: mscp_tape.c,v 1.19 2002/09/30 21:59:30 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.18 2002/09/27 20:39:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.19 2002/09/30 21:59:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -109,9 +109,8 @@ struct mscp_device mt_device = {
#define mtnorewind(dev) (dev & T_NOREWIND)
#define mthdensity(dev) (dev & T_1600BPI)
-const struct cfattach mt_ca = {
- sizeof(struct mt_softc), mtmatch, mtattach
-};
+CFATTACH_DECL(mt, sizeof(struct mt_softc),
+ mtmatch, mtattach, NULL, NULL)
extern struct cfdriver mt_cd;
diff --git a/sys/dev/mvme/clmpcc_pcctwo.c b/sys/dev/mvme/clmpcc_pcctwo.c
index b66fdf1c150..56b01bf7463 100644
--- a/sys/dev/mvme/clmpcc_pcctwo.c
+++ b/sys/dev/mvme/clmpcc_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clmpcc_pcctwo.c,v 1.3 2002/09/27 20:39:30 thorpej Exp $ */
+/* $NetBSD: clmpcc_pcctwo.c,v 1.4 2002/09/30 22:04:03 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -77,9 +77,8 @@ void clmpcc_pcctwo_attach __P((struct device *, struct device *, void *));
void clmpcc_pcctwo_iackhook __P((struct clmpcc_softc *, int));
void clmpcc_pcctwo_consiackhook __P((struct clmpcc_softc *, int));
-const struct cfattach clmpcc_pcctwo_ca = {
- sizeof(struct clmpcc_softc), clmpcc_pcctwo_match, clmpcc_pcctwo_attach
-};
+CFATTACH_DECL(clmpcc_pcctwo, sizeof(struct clmpcc_softc),
+ clmpcc_pcctwo_match, clmpcc_pcctwo_attach, NULL, NULL)
extern struct cfdriver clmpcc_cd;
diff --git a/sys/dev/mvme/clock_pcctwo.c b/sys/dev/mvme/clock_pcctwo.c
index 4c942c74757..76cad4195d4 100644
--- a/sys/dev/mvme/clock_pcctwo.c
+++ b/sys/dev/mvme/clock_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_pcctwo.c,v 1.2 2002/09/27 20:39:30 thorpej Exp $ */
+/* $NetBSD: clock_pcctwo.c,v 1.3 2002/09/30 22:04:03 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -64,9 +64,8 @@ struct clock_pcctwo_softc {
u_char sc_clock_lvl;
};
-const struct cfattach clock_pcctwo_ca = {
- sizeof(struct device), clock_pcctwo_match, clock_pcctwo_attach
-};
+CFATTACH_DECL(clock_pcctwo, sizeof(struct device),
+ clock_pcctwo_match, clock_pcctwo_attach, NULL, NULL)
extern struct cfdriver clock_cd;
diff --git a/sys/dev/mvme/if_ie_mvme.c b/sys/dev/mvme/if_ie_mvme.c
index 1d38b59561f..0a3cea65797 100644
--- a/sys/dev/mvme/if_ie_mvme.c
+++ b/sys/dev/mvme/if_ie_mvme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_mvme.c,v 1.2 2002/09/27 20:39:30 thorpej Exp $ */
+/* $NetBSD: if_ie_mvme.c,v 1.3 2002/09/30 22:04:03 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -74,9 +74,8 @@ struct ie_pcctwo_softc {
struct evcnt ps_evcnt;
};
-const struct cfattach ie_pcctwo_ca = {
- sizeof(struct ie_pcctwo_softc), ie_pcctwo_match, ie_pcctwo_attach
-};
+CFATTACH_DECL(ie_pcctwo, sizeof(struct ie_pcctwo_softc),
+ ie_pcctwo_match, ie_pcctwo_attach, NULL, NULL)
extern struct cfdriver ie_cd;
diff --git a/sys/dev/mvme/lpt_pcctwo.c b/sys/dev/mvme/lpt_pcctwo.c
index 35a0d1cc33b..a874140442b 100644
--- a/sys/dev/mvme/lpt_pcctwo.c
+++ b/sys/dev/mvme/lpt_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_pcctwo.c,v 1.2 2002/09/27 20:39:31 thorpej Exp $ */
+/* $NetBSD: lpt_pcctwo.c,v 1.3 2002/09/30 22:04:03 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -59,9 +59,8 @@
int lpt_pcctwo_match __P((struct device *, struct cfdata *, void *));
void lpt_pcctwo_attach __P((struct device *, struct device *, void *));
-const struct cfattach lpt_pcctwo_ca = {
- sizeof(struct lpt_softc), lpt_pcctwo_match, lpt_pcctwo_attach
-};
+CFATTACH_DECL(lpt_pcctwo, sizeof(struct lpt_softc),
+ lpt_pcctwo_match, lpt_pcctwo_attach, NULL, NULL)
extern struct cfdriver lpt_cd;
diff --git a/sys/dev/mvme/osiop_pcctwo.c b/sys/dev/mvme/osiop_pcctwo.c
index 3989b78ff1e..0e3d6ad85d8 100644
--- a/sys/dev/mvme/osiop_pcctwo.c
+++ b/sys/dev/mvme/osiop_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop_pcctwo.c,v 1.2 2002/09/27 20:39:31 thorpej Exp $ */
+/* $NetBSD: osiop_pcctwo.c,v 1.3 2002/09/30 22:04:03 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -69,10 +69,8 @@ struct osiop_pcctwo_softc {
struct evcnt sc_evcnt;
};
-const struct cfattach osiop_pcctwo_ca = {
- sizeof(struct osiop_pcctwo_softc), osiop_pcctwo_match,
- osiop_pcctwo_attach
-};
+CFATTACH_DECL(osiop_pcctwo, sizeof(struct osiop_pcctwo_softc),
+ osiop_pcctwo_match, osiop_pcctwo_attach, NULL, NULL)
static int osiop_pcctwo_intr __P((void *));
diff --git a/sys/dev/ofisa/com_ofisa.c b/sys/dev/ofisa/com_ofisa.c
index 9d4e5e1ce90..1d03031f460 100644
--- a/sys/dev/ofisa/com_ofisa.c
+++ b/sys/dev/ofisa/com_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_ofisa.c,v 1.5 2002/09/27 20:39:32 thorpej Exp $ */
+/* $NetBSD: com_ofisa.c,v 1.6 2002/09/30 22:08:01 thorpej Exp $ */
/*
* Copyright 1997, 1998
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ofisa.c,v 1.5 2002/09/27 20:39:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ofisa.c,v 1.6 2002/09/30 22:08:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -65,9 +65,8 @@ struct com_ofisa_softc {
int com_ofisa_probe __P((struct device *, struct cfdata *, void *));
void com_ofisa_attach __P((struct device *, struct device *, void *));
-const struct cfattach com_ofisa_ca = {
- sizeof(struct com_ofisa_softc), com_ofisa_probe, com_ofisa_attach
-};
+CFATTACH_DECL(com_ofisa, sizeof(struct com_ofisa_softc),
+ com_ofisa_probe, com_ofisa_attach, NULL, NULL)
int
com_ofisa_probe(parent, cf, aux)
diff --git a/sys/dev/ofisa/ess_ofisa.c b/sys/dev/ofisa/ess_ofisa.c
index c0eb9f45ae6..1806bcf4d2a 100644
--- a/sys/dev/ofisa/ess_ofisa.c
+++ b/sys/dev/ofisa/ess_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_ofisa.c,v 1.9 2002/09/27 20:39:33 thorpej Exp $ */
+/* $NetBSD: ess_ofisa.c,v 1.10 2002/09/30 22:08:02 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.9 2002/09/27 20:39:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.10 2002/09/30 22:08:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,9 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.9 2002/09/27 20:39:33 thorpej Exp $"
int ess_ofisa_match __P((struct device *, struct cfdata *, void *));
void ess_ofisa_attach __P((struct device *, struct device *, void *));
-const struct cfattach ess_ofisa_ca = {
- sizeof(struct ess_softc), ess_ofisa_match, ess_ofisa_attach
-};
+CFATTACH_DECL(ess_ofisa, sizeof(struct ess_softc),
+ ess_ofisa_match, ess_ofisa_attach, NULL, NULL)
int
ess_ofisa_match(parent, cf, aux)
diff --git a/sys/dev/ofisa/if_cs_ofisa.c b/sys/dev/ofisa/if_cs_ofisa.c
index 60aab826740..8060ccca095 100644
--- a/sys/dev/ofisa/if_cs_ofisa.c
+++ b/sys/dev/ofisa/if_cs_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_ofisa.c,v 1.8 2002/09/27 20:39:33 thorpej Exp $ */
+/* $NetBSD: if_cs_ofisa.c,v 1.9 2002/09/30 22:08:02 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.8 2002/09/27 20:39:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.9 2002/09/30 22:08:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,9 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.8 2002/09/27 20:39:33 thorpej Exp
int cs_ofisa_match __P((struct device *, struct cfdata *, void *));
void cs_ofisa_attach __P((struct device *, struct device *, void *));
-const struct cfattach cs_ofisa_ca = {
- sizeof(struct cs_softc_isa), cs_ofisa_match, cs_ofisa_attach
-};
+CFATTACH_DECL(cs_ofisa, sizeof(struct cs_softc_isa),
+ cs_ofisa_match, cs_ofisa_attach, NULL, NULL)
int
cs_ofisa_match(parent, cf, aux)
diff --git a/sys/dev/ofisa/joy_ofisa.c b/sys/dev/ofisa/joy_ofisa.c
index bc8af320a95..7759b4a5774 100644
--- a/sys/dev/ofisa/joy_ofisa.c
+++ b/sys/dev/ofisa/joy_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_ofisa.c,v 1.5 2002/09/27 20:39:33 thorpej Exp $ */
+/* $NetBSD: joy_ofisa.c,v 1.6 2002/09/30 22:08:02 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_ofisa.c,v 1.5 2002/09/27 20:39:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_ofisa.c,v 1.6 2002/09/30 22:08:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,9 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: joy_ofisa.c,v 1.5 2002/09/27 20:39:33 thorpej Exp $"
int joy_ofisa_match __P((struct device *, struct cfdata *, void *));
void joy_ofisa_attach __P((struct device *, struct device *, void *));
-const struct cfattach joy_ofisa_ca = {
- sizeof(struct joy_softc), joy_ofisa_match, joy_ofisa_attach
-};
+CFATTACH_DECL(joy_ofisa, sizeof(struct joy_softc),
+ joy_ofisa_match, joy_ofisa_attach, NULL, NULL)
int
joy_ofisa_match(parent, match, aux)
diff --git a/sys/dev/ofisa/lpt_ofisa.c b/sys/dev/ofisa/lpt_ofisa.c
index 87d85379781..1fd0e0aec71 100644
--- a/sys/dev/ofisa/lpt_ofisa.c
+++ b/sys/dev/ofisa/lpt_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_ofisa.c,v 1.5 2002/09/27 20:39:34 thorpej Exp $ */
+/* $NetBSD: lpt_ofisa.c,v 1.6 2002/09/30 22:08:02 thorpej Exp $ */
/*
* Copyright 1997, 1998
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa.c,v 1.5 2002/09/27 20:39:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa.c,v 1.6 2002/09/30 22:08:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -65,9 +65,8 @@ struct lpt_ofisa_softc {
int lpt_ofisa_probe __P((struct device *, struct cfdata *, void *));
void lpt_ofisa_attach __P((struct device *, struct device *, void *));
-const struct cfattach lpt_ofisa_ca = {
- sizeof(struct lpt_ofisa_softc), lpt_ofisa_probe, lpt_ofisa_attach
-};
+CFATTACH_DECL(lpt_ofisa, sizeof(struct lpt_ofisa_softc),
+ lpt_ofisa_probe, lpt_ofisa_attach, NULL, NULL)
int
lpt_ofisa_probe(parent, cf, aux)
diff --git a/sys/dev/ofisa/ofisa.c b/sys/dev/ofisa/ofisa.c
index 584471d853b..650eb76619d 100644
--- a/sys/dev/ofisa/ofisa.c
+++ b/sys/dev/ofisa/ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisa.c,v 1.10 2002/09/27 20:39:34 thorpej Exp $ */
+/* $NetBSD: ofisa.c,v 1.11 2002/09/30 22:08:02 thorpej Exp $ */
/*
* Copyright 1997, 1998
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.10 2002/09/27 20:39:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.11 2002/09/30 22:08:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,9 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.10 2002/09/27 20:39:34 thorpej Exp $");
static int ofisamatch __P((struct device *, struct cfdata *, void *));
static void ofisaattach __P((struct device *, struct device *, void *));
-const struct cfattach ofisa_ca = {
- sizeof(struct device), ofisamatch, ofisaattach
-};
+CFATTACH_DECL(ofisa, sizeof(struct device),
+ ofisamatch, ofisaattach, NULL, NULL)
extern struct cfdriver ofisa_cd;
diff --git a/sys/dev/ofisa/pckbc_ofisa.c b/sys/dev/ofisa/pckbc_ofisa.c
index 3847b704179..f5a4743071b 100644
--- a/sys/dev/ofisa/pckbc_ofisa.c
+++ b/sys/dev/ofisa/pckbc_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_ofisa.c,v 1.5 2002/09/27 20:39:35 thorpej Exp $ */
+/* $NetBSD: pckbc_ofisa.c,v 1.6 2002/09/30 22:08:02 thorpej Exp $ */
/*
* Copyright (c) 1998
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_ofisa.c,v 1.5 2002/09/27 20:39:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_ofisa.c,v 1.6 2002/09/30 22:08:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,9 +67,8 @@ struct pckbc_ofisa_softc {
struct ofisa_intr_desc sc_intr[PCKBC_NSLOTS];
};
-const struct cfattach pckbc_ofisa_ca = {
- sizeof(struct pckbc_ofisa_softc), pckbc_ofisa_match, pckbc_ofisa_attach,
-};
+CFATTACH_DECL(pckbc_ofisa, sizeof(struct pckbc_ofisa_softc),
+ pckbc_ofisa_match, pckbc_ofisa_attach, NULL, NULL)
static void pckbc_ofisa_intr_establish (struct pckbc_softc *, pckbc_slot_t);
diff --git a/sys/dev/ofisa/sb_ofisa.c b/sys/dev/ofisa/sb_ofisa.c
index 6c7b5d8cc8e..43e95394f42 100644
--- a/sys/dev/ofisa/sb_ofisa.c
+++ b/sys/dev/ofisa/sb_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_ofisa.c,v 1.8 2002/09/27 20:39:35 thorpej Exp $ */
+/* $NetBSD: sb_ofisa.c,v 1.9 2002/09/30 22:08:02 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.8 2002/09/27 20:39:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.9 2002/09/30 22:08:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,9 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.8 2002/09/27 20:39:35 thorpej Exp $")
int sb_ofisa_match __P((struct device *, struct cfdata *, void *));
void sb_ofisa_attach __P((struct device *, struct device *, void *));
-const struct cfattach sb_ofisa_ca = {
- sizeof(struct sbdsp_softc), sb_ofisa_match, sb_ofisa_attach
-};
+CFATTACH_DECL(sb_ofisa, sizeof(struct sbdsp_softc),
+ sb_ofisa_match, sb_ofisa_attach, NULL, NULL)
int
sb_ofisa_match(parent, cf, aux)
diff --git a/sys/dev/ofisa/wdc_ofisa.c b/sys/dev/ofisa/wdc_ofisa.c
index 275fd533924..41943f5a8d3 100644
--- a/sys/dev/ofisa/wdc_ofisa.c
+++ b/sys/dev/ofisa/wdc_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_ofisa.c,v 1.9 2002/09/27 20:39:36 thorpej Exp $ */
+/* $NetBSD: wdc_ofisa.c,v 1.10 2002/09/30 22:08:02 thorpej Exp $ */
/*
* Copyright 1997, 1998
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_ofisa.c,v 1.9 2002/09/27 20:39:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_ofisa.c,v 1.10 2002/09/30 22:08:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -67,9 +67,8 @@ struct wdc_ofisa_softc {
int wdc_ofisa_probe __P((struct device *, struct cfdata *, void *));
void wdc_ofisa_attach __P((struct device *, struct device *, void *));
-const struct cfattach wdc_ofisa_ca = {
- sizeof(struct wdc_ofisa_softc), wdc_ofisa_probe, wdc_ofisa_attach
-};
+CFATTACH_DECL(wdc_ofisa, sizeof(struct wdc_ofisa_softc),
+ wdc_ofisa_probe, wdc_ofisa_attach, NULL, NULL)
int
wdc_ofisa_probe(parent, cf, aux)
diff --git a/sys/dev/ofw/ofbus.c b/sys/dev/ofw/ofbus.c
index 6f698e74ec9..ff7808df64a 100644
--- a/sys/dev/ofw/ofbus.c
+++ b/sys/dev/ofw/ofbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofbus.c,v 1.14 2002/09/27 20:39:36 thorpej Exp $ */
+/* $NetBSD: ofbus.c,v 1.15 2002/09/30 22:10:08 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.14 2002/09/27 20:39:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.15 2002/09/30 22:10:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,9 +44,8 @@ int ofbus_match __P((struct device *, struct cfdata *, void *));
void ofbus_attach __P((struct device *, struct device *, void *));
static int ofbus_print __P((void *, const char *));
-const struct cfattach ofbus_ca = {
- sizeof(struct device), ofbus_match, ofbus_attach
-};
+CFATTACH_DECL(ofbus, sizeof(struct device),
+ ofbus_match, ofbus_attach, NULL, NULL)
static int
ofbus_print(aux, pnp)
diff --git a/sys/dev/ofw/ofcons.c b/sys/dev/ofw/ofcons.c
index 7713ae070b0..810e2babb17 100644
--- a/sys/dev/ofw/ofcons.c
+++ b/sys/dev/ofw/ofcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofcons.c,v 1.18 2002/09/27 20:39:37 thorpej Exp $ */
+/* $NetBSD: ofcons.c,v 1.19 2002/09/30 22:10:08 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.18 2002/09/27 20:39:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.19 2002/09/30 22:10:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -64,9 +64,8 @@ static int stdin, stdout;
static int ofcons_match __P((struct device *, struct cfdata *, void *));
static void ofcons_attach __P((struct device *, struct device *, void *));
-const struct cfattach ofcons_ca = {
- sizeof(struct ofcons_softc), ofcons_match, ofcons_attach
-};
+CFATTACH_DECL(ofcons, sizeof(struct ofcons_softc),
+ ofcons_match, ofcons_attach, NULL, NULL)
extern struct cfdriver ofcons_cd;
diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c
index a6406790254..ebff8fafae3 100644
--- a/sys/dev/ofw/ofdisk.c
+++ b/sys/dev/ofw/ofdisk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdisk.c,v 1.21 2002/09/27 20:39:38 thorpej Exp $ */
+/* $NetBSD: ofdisk.c,v 1.22 2002/09/30 22:10:08 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.21 2002/09/27 20:39:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.22 2002/09/30 22:10:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -66,9 +66,8 @@ struct ofdisk_softc {
static int ofdisk_match (struct device *, struct cfdata *, void *);
static void ofdisk_attach (struct device *, struct device *, void *);
-const struct cfattach ofdisk_ca = {
- sizeof(struct ofdisk_softc), ofdisk_match, ofdisk_attach
-};
+CFATTACH_DECL(ofdisk, sizeof(struct ofdisk_softc),
+ ofdisk_match, ofdisk_attach, NULL, NULL)
extern struct cfdriver ofdisk_cd;
diff --git a/sys/dev/ofw/ofnet.c b/sys/dev/ofw/ofnet.c
index ebcd6e3a79f..3c3a4feafb2 100644
--- a/sys/dev/ofw/ofnet.c
+++ b/sys/dev/ofw/ofnet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofnet.c,v 1.26 2002/09/27 20:39:38 thorpej Exp $ */
+/* $NetBSD: ofnet.c,v 1.27 2002/09/30 22:10:08 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.26 2002/09/27 20:39:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.27 2002/09/30 22:10:08 thorpej Exp $");
#include "ofnet.h"
#include "opt_inet.h"
@@ -67,9 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.26 2002/09/27 20:39:38 thorpej Exp $");
#include <ipkdb/ipkdb.h>
#include <machine/ipkdb.h>
-const struct cfattach ipkdb_ofn_ca = {
- 0, ipkdb_probe, ipkdb_attach
-};
+CFATTACH_DECL(ipkdb_ofn, 0,
+ ipkdb_probe, ipkdb_attach, NULL, NULL)
static struct ipkdb_if *kifp;
static struct ofnet_softc *ipkdb_of;
diff --git a/sys/dev/ofw/ofrtc.c b/sys/dev/ofw/ofrtc.c
index 69e2ebe2471..5851846993a 100644
--- a/sys/dev/ofw/ofrtc.c
+++ b/sys/dev/ofw/ofrtc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofrtc.c,v 1.12 2002/09/27 20:39:39 thorpej Exp $ */
+/* $NetBSD: ofrtc.c,v 1.13 2002/09/30 22:10:08 thorpej Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.12 2002/09/27 20:39:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.13 2002/09/30 22:10:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,9 +50,8 @@ struct ofrtc_softc {
static int ofrtc_match __P((struct device *, struct cfdata *, void *));
static void ofrtc_attach __P((struct device *, struct device *, void *));
-const struct cfattach ofrtc_ca = {
- sizeof(struct ofrtc_softc), ofrtc_match, ofrtc_attach
-};
+CFATTACH_DECL(ofrtc, sizeof(struct ofrtc_softc),
+ ofrtc_match, ofrtc_attach, NULL, NULL)
extern struct cfdriver ofrtc_cd;
diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c
index 5c216c1b619..ad8275152dd 100644
--- a/sys/dev/pckbc/pckbd.c
+++ b/sys/dev/pckbc/pckbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.31 2002/09/27 20:40:51 thorpej Exp $ */
+/* $NetBSD: pckbd.c,v 1.32 2002/09/30 22:15:33 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.31 2002/09/27 20:40:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.32 2002/09/30 22:15:33 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,9 +136,8 @@ static int pckbd_is_console __P((pckbc_tag_t, pckbc_slot_t));
int pckbdprobe __P((struct device *, struct cfdata *, void *));
void pckbdattach __P((struct device *, struct device *, void *));
-const struct cfattach pckbd_ca = {
- sizeof(struct pckbd_softc), pckbdprobe, pckbdattach,
-};
+CFATTACH_DECL(pckbd, sizeof(struct pckbd_softc),
+ pckbdprobe, pckbdattach, NULL, NULL)
int pckbd_enable __P((void *, int));
void pckbd_set_leds __P((void *, int));
diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c
index 20e6738c859..495e9fed3b8 100644
--- a/sys/dev/pckbc/pms.c
+++ b/sys/dev/pckbc/pms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.10 2002/09/27 20:40:52 thorpej Exp $ */
+/* $NetBSD: pms.c,v 1.11 2002/09/30 22:15:33 thorpej Exp $ */
/*-
* Copyright (c) 1994 Charles M. Hannum.
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.10 2002/09/27 20:40:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.11 2002/09/30 22:15:33 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,9 +91,8 @@ int pmsprobe __P((struct device *, struct cfdata *, void *));
void pmsattach __P((struct device *, struct device *, void *));
void pmsinput __P((void *, int));
-const struct cfattach pms_ca = {
- sizeof(struct pms_softc), pmsprobe, pmsattach,
-};
+CFATTACH_DECL(pms, sizeof(struct pms_softc),
+ pmsprobe, pmsattach, NULL, NULL)
static int pms_protocol __P((pckbc_tag_t, pckbc_slot_t));
static void do_enable __P((struct pms_softc *));
diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c
index c42bc8fa6bf..74cdc96e2ac 100644
--- a/sys/dev/pcmcia/aic_pcmcia.c
+++ b/sys/dev/pcmcia/aic_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_pcmcia.c,v 1.20 2002/09/27 20:40:53 thorpej Exp $ */
+/* $NetBSD: aic_pcmcia.c,v 1.21 2002/09/30 22:26:59 thorpej Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.20 2002/09/27 20:40:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.21 2002/09/30 22:26:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,10 +67,8 @@ struct aic_pcmcia_softc {
#define AIC_PCMCIA_ATTACH 0x0001 /* attach is in progress */
};
-const struct cfattach aic_pcmcia_ca = {
- sizeof(struct aic_pcmcia_softc), aic_pcmcia_match, aic_pcmcia_attach,
- aic_pcmcia_detach, aic_activate
-};
+CFATTACH_DECL(aic_pcmcia, sizeof(struct aic_pcmcia_softc),
+ aic_pcmcia_match, aic_pcmcia_attach, aic_pcmcia_detach, aic_activate)
int aic_pcmcia_enable __P((struct device *, int));
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 24c89afcf29..043f9e07253 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_pcmcia.c,v 1.30 2002/09/27 20:40:53 thorpej Exp $ */
+/* $NetBSD: com_pcmcia.c,v 1.31 2002/09/30 22:26:59 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.30 2002/09/27 20:40:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.31 2002/09/30 22:26:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -134,10 +134,8 @@ struct com_pcmcia_softc {
void *sc_ih; /* interrupt handler */
};
-const struct cfattach com_pcmcia_ca = {
- sizeof(struct com_pcmcia_softc), com_pcmcia_match, com_pcmcia_attach,
- com_pcmcia_detach, com_activate
-};
+CFATTACH_DECL(com_pcmcia, sizeof(struct com_pcmcia_softc),
+ com_pcmcia_match, com_pcmcia_attach, com_pcmcia_detach, com_activate)
/* Look for pcmcia cards with particular CIS strings */
static struct com_dev *
diff --git a/sys/dev/pcmcia/esl_pcmcia.c b/sys/dev/pcmcia/esl_pcmcia.c
index 49c785c3b64..43ed9f244bc 100644
--- a/sys/dev/pcmcia/esl_pcmcia.c
+++ b/sys/dev/pcmcia/esl_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esl_pcmcia.c,v 1.6 2002/09/27 20:40:54 thorpej Exp $ */
+/* $NetBSD: esl_pcmcia.c,v 1.7 2002/09/30 22:26:59 thorpej Exp $ */
/*
* Copyright (c) 2000 Jared D. McNeill <jmcneill@invisible.yi.org>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esl_pcmcia.c,v 1.6 2002/09/27 20:40:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esl_pcmcia.c,v 1.7 2002/09/30 22:26:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,10 +75,8 @@ int esl_pcmcia_detach(struct device *, int);
int esl_pcmcia_enable(struct esl_pcmcia_softc *);
void esl_pcmcia_disable(struct esl_pcmcia_softc *);
-const struct cfattach esl_pcmcia_ca = {
- sizeof(struct esl_pcmcia_softc), esl_pcmcia_match, esl_pcmcia_attach,
- esl_pcmcia_detach
-};
+CFATTACH_DECL(esl_pcmcia, sizeof(struct esl_pcmcia_softc),
+ esl_pcmcia_match, esl_pcmcia_attach, esl_pcmcia_detach, NULL)
#define ESL_NDEVS (sizeof(esl_pcmcia_products) / sizeof(esl_pcmcia_products[0]))
diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c
index 6851c00679d..0b0988a1bd5 100644
--- a/sys/dev/pcmcia/esp_pcmcia.c
+++ b/sys/dev/pcmcia/esp_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_pcmcia.c,v 1.12 2002/09/27 20:40:55 thorpej Exp $ */
+/* $NetBSD: esp_pcmcia.c,v 1.13 2002/09/30 22:26:59 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.12 2002/09/27 20:40:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.13 2002/09/30 22:26:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,10 +88,8 @@ void esp_pcmcia_init __P((struct esp_pcmcia_softc *));
int esp_pcmcia_detach __P((struct device *, int));
int esp_pcmcia_enable __P((void *, int));
-const struct cfattach esp_pcmcia_ca = {
- sizeof(struct esp_pcmcia_softc), esp_pcmcia_match, esp_pcmcia_attach,
- esp_pcmcia_detach
-};
+CFATTACH_DECL(esp_pcmcia, sizeof(struct esp_pcmcia_softc),
+ esp_pcmcia_match, esp_pcmcia_attach, esp_pcmcia_detach, NULL)
/*
* Functions and the switch for the MI code.
diff --git a/sys/dev/pcmcia/fdc_pcmcia.c b/sys/dev/pcmcia/fdc_pcmcia.c
index 01407ff10c2..0552b94b7d8 100644
--- a/sys/dev/pcmcia/fdc_pcmcia.c
+++ b/sys/dev/pcmcia/fdc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_pcmcia.c,v 1.8 2002/09/27 20:40:55 thorpej Exp $ */
+/* $NetBSD: fdc_pcmcia.c,v 1.9 2002/09/30 22:26:59 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.8 2002/09/27 20:40:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.9 2002/09/30 22:26:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,9 +69,8 @@ int fdc_pcmcia_probe __P((struct device *, struct cfdata *, void *));
void fdc_pcmcia_attach __P((struct device *, struct device *, void *));
static void fdc_conf __P((struct fdc_softc *));
-const struct cfattach fdc_pcmcia_ca = {
- sizeof(struct fdc_pcmcia_softc), fdc_pcmcia_probe, fdc_pcmcia_attach
-};
+CFATTACH_DECL(fdc_pcmcia, sizeof(struct fdc_pcmcia_softc),
+ fdc_pcmcia_probe, fdc_pcmcia_attach, NULL, NULL)
static void
fdc_conf(fdc)
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index 31ab5fec36c..5c17bcfdfde 100644
--- a/sys/dev/pcmcia/if_an_pcmcia.c
+++ b/sys/dev/pcmcia/if_an_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pcmcia.c,v 1.12 2002/09/27 20:40:56 thorpej Exp $ */
+/* $NetBSD: if_an_pcmcia.c,v 1.13 2002/09/30 22:26:59 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.12 2002/09/27 20:40:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.13 2002/09/30 22:26:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,10 +84,8 @@ struct an_pcmcia_softc {
void *sc_powerhook; /* power hook descriptor */
};
-const struct cfattach an_pcmcia_ca = {
- sizeof(struct an_pcmcia_softc), an_pcmcia_match, an_pcmcia_attach,
- an_pcmcia_detach, an_activate
-};
+CFATTACH_DECL(an_pcmcia, sizeof(struct an_pcmcia_softc),
+ an_pcmcia_match, an_pcmcia_attach, an_pcmcia_detach, an_activate)
static struct an_pcmcia_product {
u_int32_t app_vendor; /* vendor ID */
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c
index 1ca4ee874bd..f675b32460d 100644
--- a/sys/dev/pcmcia/if_awi_pcmcia.c
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_awi_pcmcia.c,v 1.24 2002/09/27 20:40:57 thorpej Exp $ */
+/* $NetBSD: if_awi_pcmcia.c,v 1.25 2002/09/30 22:26:59 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.24 2002/09/27 20:40:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.25 2002/09/30 22:26:59 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,10 +97,8 @@ struct awi_pcmcia_softc {
static int awi_pcmcia_find __P((struct awi_pcmcia_softc *,
struct pcmcia_attach_args *, struct pcmcia_config_entry *));
-const struct cfattach awi_pcmcia_ca = {
- sizeof(struct awi_pcmcia_softc), awi_pcmcia_match, awi_pcmcia_attach,
- awi_pcmcia_detach, awi_activate
-};
+CFATTACH_DECL(awi_pcmcia, sizeof(struct awi_pcmcia_softc),
+ awi_pcmcia_match, awi_pcmcia_attach, awi_pcmcia_detach, awi_activate)
static const struct awi_pcmcia_product {
u_int32_t app_vendor; /* vendor ID */
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c
index 737aa01df4f..fce224f411e 100644
--- a/sys/dev/pcmcia/if_cnw.c
+++ b/sys/dev/pcmcia/if_cnw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.22 2002/09/27 20:40:57 thorpej Exp $ */
+/* $NetBSD: if_cnw.c,v 1.23 2002/09/30 22:27:00 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -113,7 +113,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.22 2002/09/27 20:40:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.23 2002/09/30 22:27:00 thorpej Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -222,11 +222,8 @@ struct cnw_softc {
#define CNW_RES_NET 8
};
-const struct cfattach cnw_ca = {
- sizeof(struct cnw_softc), cnw_match, cnw_attach, cnw_detach,
- cnw_activate
-};
-
+CFATTACH_DECL(cnw, sizeof(struct cnw_softc),
+ cnw_match, cnw_attach, cnw_detach, cnw_activate)
void cnw_reset __P((struct cnw_softc *));
void cnw_init __P((struct cnw_softc *));
diff --git a/sys/dev/pcmcia/if_cs_pcmcia.c b/sys/dev/pcmcia/if_cs_pcmcia.c
index 5af0e3cac69..05c19dfb78c 100644
--- a/sys/dev/pcmcia/if_cs_pcmcia.c
+++ b/sys/dev/pcmcia/if_cs_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_pcmcia.c,v 1.3 2002/09/27 20:40:58 thorpej Exp $ */
+/* $NetBSD: if_cs_pcmcia.c,v 1.4 2002/09/30 22:27:00 thorpej Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.3 2002/09/27 20:40:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.4 2002/09/30 22:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,13 +76,8 @@ struct cs_pcmcia_softc {
#define CS_PCMCIA_FLAGS_IO_ALLOCATED 1
#define CS_PCMCIA_FLAGS_IO_MAPPED 2
-const struct cfattach cs_pcmcia_ca = {
- sizeof(struct cs_pcmcia_softc),
- cs_pcmcia_match,
- cs_pcmcia_attach,
- cs_pcmcia_detach,
- cs_activate
-};
+CFATTACH_DECL(cs_pcmcia, sizeof(struct cs_pcmcia_softc),
+ cs_pcmcia_match, cs_pcmcia_attach, cs_pcmcia_detach, cs_activate)
static int
cs_pcmcia_match(struct device *parent, struct cfdata *match, void *aux)
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index 464ac2b723f..a66d3cee9f7 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_pcmcia.c,v 1.39 2002/09/27 20:40:58 thorpej Exp $ */
+/* $NetBSD: if_ep_pcmcia.c,v 1.40 2002/09/30 22:27:00 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.39 2002/09/27 20:40:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.40 2002/09/30 22:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,10 +117,8 @@ struct ep_pcmcia_softc {
struct pcmcia_function *sc_pf; /* our PCMCIA function */
};
-const struct cfattach ep_pcmcia_ca = {
- sizeof(struct ep_pcmcia_softc), ep_pcmcia_match, ep_pcmcia_attach,
- ep_pcmcia_detach, ep_activate
-};
+CFATTACH_DECL(ep_pcmcia, sizeof(struct ep_pcmcia_softc),
+ ep_pcmcia_match, ep_pcmcia_attach, ep_pcmcia_detach, ep_activate)
const struct ep_pcmcia_product {
struct pcmcia_product epp_product;
diff --git a/sys/dev/pcmcia/if_mbe_pcmcia.c b/sys/dev/pcmcia/if_mbe_pcmcia.c
index 67e95f79c40..df552abdc05 100644
--- a/sys/dev/pcmcia/if_mbe_pcmcia.c
+++ b/sys/dev/pcmcia/if_mbe_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mbe_pcmcia.c,v 1.27 2002/09/27 20:40:59 thorpej Exp $ */
+/* $NetBSD: if_mbe_pcmcia.c,v 1.28 2002/09/30 22:27:00 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.27 2002/09/27 20:40:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.28 2002/09/30 22:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,10 +75,8 @@ struct mbe_pcmcia_softc {
struct pcmcia_function *sc_pf; /* our PCMCIA function */
};
-const struct cfattach mbe_pcmcia_ca = {
- sizeof(struct mbe_pcmcia_softc), mbe_pcmcia_match, mbe_pcmcia_attach,
- mbe_pcmcia_detach, mb86960_activate
-};
+CFATTACH_DECL(mbe_pcmcia, sizeof(struct mbe_pcmcia_softc),
+ mbe_pcmcia_match, mbe_pcmcia_attach, mbe_pcmcia_detach, mb86960_activate)
int mbe_pcmcia_enable __P((struct mb86960_softc *));
void mbe_pcmcia_disable __P((struct mb86960_softc *));
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 7cecac7e85b..70f8fcbabba 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pcmcia.c,v 1.97 2002/09/27 20:41:00 thorpej Exp $ */
+/* $NetBSD: if_ne_pcmcia.c,v 1.98 2002/09/30 22:27:00 thorpej Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.97 2002/09/27 20:41:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.98 2002/09/30 22:27:00 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,10 +90,8 @@ u_int8_t *
u_int8_t [ETHER_ADDR_LEN]));
int ne_pcmcia_ax88190_set_iobase __P((struct ne_pcmcia_softc *));
-const struct cfattach ne_pcmcia_ca = {
- sizeof(struct ne_pcmcia_softc), ne_pcmcia_match, ne_pcmcia_attach,
- ne_pcmcia_detach, dp8390_activate
-};
+CFATTACH_DECL(ne_pcmcia, sizeof(struct ne_pcmcia_softc),
+ ne_pcmcia_match, ne_pcmcia_attach, ne_pcmcia_detach, dp8390_activate)
static const struct ne2000dev {
char *name;
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index 1b63f7199c5..6a425780529 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.34 2002/09/27 20:41:01 thorpej Exp $ */
+/* $NetBSD: if_ray.c,v 1.35 2002/09/30 22:27:01 thorpej Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
* All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.34 2002/09/27 20:41:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.35 2002/09/30 22:27:01 thorpej Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -464,11 +464,8 @@ static ray_cmd_func_t ray_subcmdtab[] = {
static int ray_nsubcmdtab = sizeof(ray_subcmdtab) / sizeof(*ray_subcmdtab);
/* autoconf information */
-const struct cfattach ray_ca = {
- sizeof(struct ray_softc), ray_match, ray_attach, ray_detach,
- ray_activate
-};
-
+CFATTACH_DECL(ray, sizeof(struct ray_softc),
+ ray_match, ray_attach, ray_detach, ray_activate)
/*
* Config Routines
diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c
index 17c1107f93f..af803da3b04 100644
--- a/sys/dev/pcmcia/if_sm_pcmcia.c
+++ b/sys/dev/pcmcia/if_sm_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_pcmcia.c,v 1.28 2002/09/27 20:41:03 thorpej Exp $ */
+/* $NetBSD: if_sm_pcmcia.c,v 1.29 2002/09/30 22:27:01 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.28 2002/09/27 20:41:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.29 2002/09/30 22:27:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,10 +82,8 @@ struct sm_pcmcia_softc {
struct pcmcia_function *sc_pf; /* our PCMCIA function */
};
-const struct cfattach sm_pcmcia_ca = {
- sizeof(struct sm_pcmcia_softc), sm_pcmcia_match, sm_pcmcia_attach,
- sm_pcmcia_detach, smc91cxx_activate
-};
+CFATTACH_DECL(sm_pcmcia, sizeof(struct sm_pcmcia_softc),
+ sm_pcmcia_match, sm_pcmcia_attach, sm_pcmcia_detach, smc91cxx_activate)
int sm_pcmcia_enable __P((struct smc91cxx_softc *));
void sm_pcmcia_disable __P((struct smc91cxx_softc *));
diff --git a/sys/dev/pcmcia/if_tr_pcmcia.c b/sys/dev/pcmcia/if_tr_pcmcia.c
index 86576fdd2ab..9d6e71e0475 100644
--- a/sys/dev/pcmcia/if_tr_pcmcia.c
+++ b/sys/dev/pcmcia/if_tr_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_pcmcia.c,v 1.9 2002/09/27 20:41:03 thorpej Exp $ */
+/* $NetBSD: if_tr_pcmcia.c,v 1.10 2002/09/30 22:27:01 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.9 2002/09/27 20:41:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.10 2002/09/30 22:27:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,13 +102,8 @@ static void tr_pcmcia_mediastatus(struct tr_softc *, struct ifmediareq *);
static void tr_pcmcia_disable(struct tr_softc *);
static void tr_pcmcia_setup(struct tr_softc *);
-const struct cfattach tr_pcmcia_ca = {
- sizeof(struct tr_pcmcia_softc),
- tr_pcmcia_match,
- tr_pcmcia_attach,
- tr_pcmcia_detach,
- tr_activate
-};
+CFATTACH_DECL(tr_pcmcia, sizeof(struct tr_pcmcia_softc),
+ tr_pcmcia_match, tr_pcmcia_attach, tr_pcmcia_detach, tr_activate)
static int
tr_pcmcia_match(parent, match, aux)
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index 0b9b558df40..bfce1ca79eb 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.27 2002/09/30 06:29:30 onoe Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.28 2002/09/30 22:27:01 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.27 2002/09/30 06:29:30 onoe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.28 2002/09/30 22:27:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -101,10 +101,8 @@ struct wi_pcmcia_softc {
static int wi_pcmcia_find __P((struct wi_pcmcia_softc *,
struct pcmcia_attach_args *, struct pcmcia_config_entry *));
-const struct cfattach wi_pcmcia_ca = {
- sizeof(struct wi_pcmcia_softc), wi_pcmcia_match, wi_pcmcia_attach,
- wi_pcmcia_detach, wi_activate,
-};
+CFATTACH_DECL(wi_pcmcia, sizeof(struct wi_pcmcia_softc),
+ wi_pcmcia_match, wi_pcmcia_attach, wi_pcmcia_detach, wi_activate)
static const struct wi_pcmcia_product {
u_int32_t pp_vendor; /* vendor ID */
diff --git a/sys/dev/pcmcia/if_xi.c b/sys/dev/pcmcia/if_xi.c
index 4b3c062f29b..87f6ffcc323 100644
--- a/sys/dev/pcmcia/if_xi.c
+++ b/sys/dev/pcmcia/if_xi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xi.c,v 1.24 2002/09/27 20:41:05 thorpej Exp $ */
+/* $NetBSD: if_xi.c,v 1.25 2002/09/30 22:27:01 thorpej Exp $ */
/* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */
/*
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.24 2002/09/27 20:41:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.25 2002/09/30 22:27:01 thorpej Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -182,13 +182,8 @@ struct xi_pcmcia_softc {
#define XI_RES_MI 8
};
-const struct cfattach xi_pcmcia_ca = {
- sizeof(struct xi_pcmcia_softc),
- xi_pcmcia_match,
- xi_pcmcia_attach,
- xi_pcmcia_detach,
- xi_pcmcia_activate
-};
+CFATTACH_DECL(xi_pcmcia, sizeof(struct xi_pcmcia_softc),
+ xi_pcmcia_match, xi_pcmcia_attach, xi_pcmcia_detach, xi_pcmcia_activate)
static int xi_pcmcia_cis_quirks __P((struct pcmcia_function *));
static void xi_cycle_power __P((struct xi_softc *));
diff --git a/sys/dev/pcmcia/isic_pcmcia.c b/sys/dev/pcmcia/isic_pcmcia.c
index 39f27ac63ee..647d7e81ce8 100644
--- a/sys/dev/pcmcia/isic_pcmcia.c
+++ b/sys/dev/pcmcia/isic_pcmcia.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.17 2002/09/27 20:41:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.18 2002/09/30 22:27:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -90,10 +90,9 @@ static int isic_pcmcia_isdn_attach __P((struct isic_softc *sc, const char*));
static int isic_pcmcia_detach(struct device *self, int flags);
static int isic_pcmcia_activate(struct device *self, enum devact act);
-const struct cfattach isic_pcmcia_ca = {
- sizeof(struct pcmcia_isic_softc), isic_pcmcia_match,
- isic_pcmcia_attach, isic_pcmcia_detach, isic_pcmcia_activate
-};
+CFATTACH_DECL(isic_pcmcia, sizeof(struct pcmcia_isic_softc),
+ isic_pcmcia_match, isic_pcmcia_attach,
+ isic_pcmcia_detach, isic_pcmcia_activate)
struct isic_pcmcia_card_entry {
int32_t vendor; /* vendor ID */
diff --git a/sys/dev/pcmcia/mhzc.c b/sys/dev/pcmcia/mhzc.c
index fdc83aa17ab..01e29a48d87 100644
--- a/sys/dev/pcmcia/mhzc.c
+++ b/sys/dev/pcmcia/mhzc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mhzc.c,v 1.11 2002/09/27 20:41:06 thorpej Exp $ */
+/* $NetBSD: mhzc.c,v 1.12 2002/09/30 22:27:01 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.11 2002/09/27 20:41:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.12 2002/09/30 22:27:01 thorpej Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -141,10 +141,8 @@ void mhzc_attach __P((struct device *, struct device *, void *));
int mhzc_detach __P((struct device *, int));
int mhzc_activate __P((struct device *, enum devact));
-const struct cfattach mhzc_ca = {
- sizeof(struct mhzc_softc), mhzc_match, mhzc_attach,
- mhzc_detach, mhzc_activate
-};
+CFATTACH_DECL(mhzc, sizeof(struct mhzc_softc),
+ mhzc_match, mhzc_attach, mhzc_detach, mhzc_activate)
int mhzc_em3336_enaddr __P((struct mhzc_softc *, u_int8_t *));
int mhzc_em3336_enable __P((struct mhzc_softc *));
@@ -665,10 +663,8 @@ void com_mhzc_attach __P((struct device *, struct device *, void *));
int com_mhzc_detach __P((struct device *, int));
/* No mhzc-specific goo in the softc; it's all in the parent. */
-const struct cfattach com_mhzc_ca = {
- sizeof(struct com_softc), com_mhzc_match, com_mhzc_attach,
- com_detach, com_activate
-};
+CFATTACH_DECL(com_mhzc, sizeof(struct com_softc),
+ com_mhzc_match, com_mhzc_attach, com_detach, com_activate)
int com_mhzc_enable __P((struct com_softc *));
void com_mhzc_disable __P((struct com_softc *));
@@ -753,10 +749,8 @@ int sm_mhzc_match __P((struct device *, struct cfdata *, void *));
void sm_mhzc_attach __P((struct device *, struct device *, void *));
/* No mhzc-specific goo in the softc; it's all in the parent. */
-const struct cfattach sm_mhzc_ca = {
- sizeof(struct smc91cxx_softc), sm_mhzc_match, sm_mhzc_attach,
- smc91cxx_detach, smc91cxx_activate
-};
+CFATTACH_DECL(sm_mhzc, sizeof(struct smc91cxx_softc),
+ sm_mhzc_match, sm_mhzc_attach, smc91cxx_detach, smc91cxx_activate)
int sm_mhzc_enable __P((struct smc91cxx_softc *));
void sm_mhzc_disable __P((struct smc91cxx_softc *));
diff --git a/sys/dev/pcmcia/nca_pcmcia.c b/sys/dev/pcmcia/nca_pcmcia.c
index b4516f704c4..5757a1e282b 100644
--- a/sys/dev/pcmcia/nca_pcmcia.c
+++ b/sys/dev/pcmcia/nca_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nca_pcmcia.c,v 1.7 2002/09/27 20:41:07 thorpej Exp $ */
+/* $NetBSD: nca_pcmcia.c,v 1.8 2002/09/30 22:27:01 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nca_pcmcia.c,v 1.7 2002/09/27 20:41:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nca_pcmcia.c,v 1.8 2002/09/30 22:27:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,10 +77,8 @@ void nca_pcmcia_attach __P((struct device *, struct device *, void *));
int nca_pcmcia_detach __P((struct device *, int));
int nca_pcmcia_enable __P((struct device *, int));
-const struct cfattach nca_pcmcia_ca = {
- sizeof(struct nca_pcmcia_softc), nca_pcmcia_match, nca_pcmcia_attach,
- nca_pcmcia_detach
-};
+CFATTACH_DECL(nca_pcmcia, sizeof(struct nca_pcmcia_softc),
+ nca_pcmcia_match, nca_pcmcia_attach, nca_pcmcia_detach, NULL)
#define MIN_DMA_LEN 128
diff --git a/sys/dev/pcmcia/opl_esl.c b/sys/dev/pcmcia/opl_esl.c
index 3ce5b9659cd..60008b434b7 100644
--- a/sys/dev/pcmcia/opl_esl.c
+++ b/sys/dev/pcmcia/opl_esl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_esl.c,v 1.5 2002/09/27 20:41:07 thorpej Exp $ */
+/* $NetBSD: opl_esl.c,v 1.6 2002/09/30 22:27:01 thorpej Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.yi.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.5 2002/09/27 20:41:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.6 2002/09/30 22:27:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,10 +63,8 @@ int opl_esl_match(struct device *, struct cfdata *, void *);
void opl_esl_attach(struct device *, struct device *, void *);
int opl_esl_detach(struct device *, int);
-const struct cfattach opl_esl_ca = {
- sizeof(struct opl_softc), opl_esl_match, opl_esl_attach,
- opl_esl_detach
-};
+CFATTACH_DECL(opl_esl, sizeof(struct opl_softc),
+ opl_esl_match, opl_esl_attach, opl_esl_detach, NULL)
int
opl_esl_match(struct device *parent, struct cfdata *match, void *aux)
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index e78209c3ae2..36ee0ee551a 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia.c,v 1.32 2002/09/27 20:41:08 thorpej Exp $ */
+/* $NetBSD: pcmcia.c,v 1.33 2002/09/30 22:27:01 thorpej Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.32 2002/09/27 20:41:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.33 2002/09/30 22:27:01 thorpej Exp $");
#include "opt_pcmciaverbose.h"
@@ -80,9 +80,8 @@ int pcmcia_card_intr __P((void *));
int pcmcia_card_intrdebug __P((void *));
#endif
-const struct cfattach pcmcia_ca = {
- sizeof(struct pcmcia_softc), pcmcia_match, pcmcia_attach
-};
+CFATTACH_DECL(pcmcia, sizeof(struct pcmcia_softc),
+ pcmcia_match, pcmcia_attach, NULL, NULL)
int
pcmcia_ccr_read(pf, ccr)
diff --git a/sys/dev/pcmcia/pcmcom.c b/sys/dev/pcmcia/pcmcom.c
index dff79726bb9..b85d49a9f7e 100644
--- a/sys/dev/pcmcia/pcmcom.c
+++ b/sys/dev/pcmcia/pcmcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcom.c,v 1.11 2002/09/27 20:41:09 thorpej Exp $ */
+/* $NetBSD: pcmcom.c,v 1.12 2002/09/30 22:27:01 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.11 2002/09/27 20:41:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.12 2002/09/30 22:27:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,10 +102,8 @@ void pcmcom_attach __P((struct device *, struct device *, void *));
int pcmcom_detach __P((struct device *, int));
int pcmcom_activate __P((struct device *, enum devact));
-const struct cfattach pcmcom_ca = {
- sizeof(struct pcmcom_softc), pcmcom_match, pcmcom_attach,
- pcmcom_detach, pcmcom_activate
-};
+CFATTACH_DECL(pcmcom, sizeof(struct pcmcom_softc),
+ pcmcom_match, pcmcom_attach, pcmcom_detach, pcmcom_activate)
const struct pcmcom_product {
struct pcmcia_product pp_product;
@@ -431,10 +429,8 @@ int com_pcmcom_match __P((struct device *, struct cfdata *, void *));
void com_pcmcom_attach __P((struct device *, struct device *, void *));
/* No pcmcom-specific goo in the softc; it's all in the parent. */
-const struct cfattach com_pcmcom_ca = {
- sizeof(struct com_softc), com_pcmcom_match, com_pcmcom_attach,
- com_detach, com_activate
-};
+CFATTACH_DECL(com_pcmcom, sizeof(struct com_softc),
+ com_pcmcom_match, com_pcmcom_attach, com_detach, com_activate)
int com_pcmcom_enable __P((struct com_softc *));
void com_pcmcom_disable __P((struct com_softc *));
diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c
index f288a2f67f6..8a8b73762a3 100644
--- a/sys/dev/pcmcia/wdc_pcmcia.c
+++ b/sys/dev/pcmcia/wdc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pcmcia.c,v 1.50 2002/09/27 20:41:10 thorpej Exp $ */
+/* $NetBSD: wdc_pcmcia.c,v 1.51 2002/09/30 22:27:02 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.50 2002/09/27 20:41:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.51 2002/09/30 22:27:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -81,10 +81,8 @@ static int wdc_pcmcia_match __P((struct device *, struct cfdata *, void *));
static void wdc_pcmcia_attach __P((struct device *, struct device *, void *));
static int wdc_pcmcia_detach __P((struct device *, int));
-const struct cfattach wdc_pcmcia_ca = {
- sizeof(struct wdc_pcmcia_softc), wdc_pcmcia_match, wdc_pcmcia_attach,
- wdc_pcmcia_detach, wdcactivate
-};
+CFATTACH_DECL(wdc_pcmcia, sizeof(struct wdc_pcmcia_softc),
+ wdc_pcmcia_match, wdc_pcmcia_attach, wdc_pcmcia_detach, wdcactivate)
const struct wdc_pcmcia_product {
u_int32_t wpp_vendor; /* vendor ID */
diff --git a/sys/dev/podulebus/acemidi.c b/sys/dev/podulebus/acemidi.c
index 839cfd03d9f..777c89ef153 100644
--- a/sys/dev/podulebus/acemidi.c
+++ b/sys/dev/podulebus/acemidi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acemidi.c,v 1.5 2002/09/27 20:41:11 thorpej Exp $ */
+/* $NetBSD: acemidi.c,v 1.6 2002/09/30 22:33:19 thorpej Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.5 2002/09/27 20:41:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.6 2002/09/30 22:33:19 thorpej Exp $");
#include <sys/param.h>
@@ -59,13 +59,11 @@ static void acemidi_attach(struct device *, struct device *, void *);
static int com_acemidi_match(struct device *, struct cfdata *, void *);
static void com_acemidi_attach(struct device *, struct device *, void *);
-const struct cfattach acemidi_ca = {
- sizeof(struct acemidi_softc), acemidi_match, acemidi_attach
-};
+CFATTACH_DECL(acemidi, sizeof(struct acemidi_softc),
+ acemidi_match, acemidi_attach, NULL, NULL)
-const struct cfattach com_acemidi_ca = {
- sizeof(struct com_acemidi_softc), com_acemidi_match, com_acemidi_attach
-};
+CFATTACH_DECL(com_acemidi, sizeof(struct com_acemidi_softc),
+ com_acemidi_match, com_acemidi_attach, NULL, NULL)
static int
acemidi_match(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/dev/podulebus/dtide.c b/sys/dev/podulebus/dtide.c
index d4c08c28c68..7105d762415 100644
--- a/sys/dev/podulebus/dtide.c
+++ b/sys/dev/podulebus/dtide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dtide.c,v 1.6 2002/09/27 20:41:11 thorpej Exp $ */
+/* $NetBSD: dtide.c,v 1.7 2002/09/30 22:33:19 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dtide.c,v 1.6 2002/09/27 20:41:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtide.c,v 1.7 2002/09/30 22:33:19 thorpej Exp $");
#include <sys/param.h>
@@ -60,9 +60,8 @@ struct dtide_softc {
static int dtide_match(struct device *, struct cfdata *, void *);
static void dtide_attach(struct device *, struct device *, void *);
-const struct cfattach dtide_ca = {
- sizeof(struct dtide_softc), dtide_match, dtide_attach
-};
+CFATTACH_DECL(dtide, sizeof(struct dtide_softc),
+ dtide_match, dtide_attach, NULL, NULL)
static const int dtide_cmdoffsets[] = { DTIDE_CMDBASE0, DTIDE_CMDBASE1 };
static const int dtide_ctloffsets[] = { DTIDE_CTLBASE0, DTIDE_CTLBASE1 };
diff --git a/sys/dev/podulebus/hcide.c b/sys/dev/podulebus/hcide.c
index 97b3c3bad3e..00e0d916bed 100644
--- a/sys/dev/podulebus/hcide.c
+++ b/sys/dev/podulebus/hcide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hcide.c,v 1.3 2002/09/27 20:41:11 thorpej Exp $ */
+/* $NetBSD: hcide.c,v 1.4 2002/09/30 22:33:19 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hcide.c,v 1.3 2002/09/27 20:41:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hcide.c,v 1.4 2002/09/30 22:33:19 thorpej Exp $");
#include <sys/param.h>
@@ -57,9 +57,8 @@ struct hcide_softc {
static void hcide_attach (struct device *, struct device *, void *);
static int hcide_match (struct device *, struct cfdata *, void *);
-const struct cfattach hcide_ca = {
- sizeof(struct hcide_softc), hcide_match, hcide_attach
-};
+CFATTACH_DECL(hcide, sizeof(struct hcide_softc),
+ hcide_match, hcide_attach, NULL, NULL)
static const int hcide_cmdoffsets[] = { HCIDE_CMD0, HCIDE_CMD1, HCIDE_CMD2 };
static const int hcide_ctloffsets[] = { HCIDE_CTL, HCIDE_CTL, HCIDE_CTL };
diff --git a/sys/dev/podulebus/hcsc.c b/sys/dev/podulebus/hcsc.c
index bb9a4b26d56..73b55a978c4 100644
--- a/sys/dev/podulebus/hcsc.c
+++ b/sys/dev/podulebus/hcsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hcsc.c,v 1.10 2002/09/27 20:41:12 thorpej Exp $ */
+/* $NetBSD: hcsc.c,v 1.11 2002/09/30 22:33:19 thorpej Exp $ */
/*
* Copyright (c) 2001 Ben Harris
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hcsc.c,v 1.10 2002/09/27 20:41:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hcsc.c,v 1.11 2002/09/30 22:33:19 thorpej Exp $");
#include <sys/param.h>
@@ -119,9 +119,8 @@ struct hcsc_softc {
struct evcnt sc_intrcnt;
};
-const struct cfattach hcsc_ca = {
- sizeof(struct hcsc_softc), hcsc_match, hcsc_attach
-};
+CFATTACH_DECL(hcsc, sizeof(struct hcsc_softc),
+ hcsc_match, hcsc_attach, NULL, NULL)
/*
* Card probe function
diff --git a/sys/dev/podulebus/if_ea.c b/sys/dev/podulebus/if_ea.c
index 965689e1093..da1c3dfac15 100644
--- a/sys/dev/podulebus/if_ea.c
+++ b/sys/dev/podulebus/if_ea.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ea.c,v 1.7 2002/09/27 20:41:12 thorpej Exp $ */
+/* $NetBSD: if_ea.c,v 1.8 2002/09/30 22:33:19 thorpej Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.7 2002/09/27 20:41:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.8 2002/09/30 22:33:19 thorpej Exp $");
#include <sys/param.h>
@@ -76,9 +76,8 @@ void eaattach(struct device *, struct device *, void *);
/* driver structure for autoconf */
-const struct cfattach ea_ca = {
- sizeof(struct ea_softc), eaprobe, eaattach
-};
+CFATTACH_DECL(ea, sizeof(struct ea_softc),
+ eaprobe, eaattach, NULL, NULL)
/*
* Probe routine.
diff --git a/sys/dev/podulebus/if_eb.c b/sys/dev/podulebus/if_eb.c
index f4a065f31ad..5e7cf882880 100644
--- a/sys/dev/podulebus/if_eb.c
+++ b/sys/dev/podulebus/if_eb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eb.c,v 1.5 2002/09/27 20:41:13 thorpej Exp $ */
+/* $NetBSD: if_eb.c,v 1.6 2002/09/30 22:33:19 thorpej Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.5 2002/09/27 20:41:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.6 2002/09/30 22:33:19 thorpej Exp $");
#include <sys/param.h>
@@ -76,9 +76,8 @@ void ebattach(struct device *, struct device *, void *);
/* driver structure for autoconf */
-const struct cfattach eb_ca = {
- sizeof(struct eb_softc), ebprobe, ebattach
-};
+CFATTACH_DECL(eb, sizeof(struct eb_softc),
+ ebprobe, ebattach, NULL, NULL)
/*
* Probe routine.
diff --git a/sys/dev/podulebus/if_ei.c b/sys/dev/podulebus/if_ei.c
index 2c339b176af..e52e609bdf3 100644
--- a/sys/dev/podulebus/if_ei.c
+++ b/sys/dev/podulebus/if_ei.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ei.c,v 1.6 2002/09/27 20:41:13 thorpej Exp $ */
+/* $NetBSD: if_ei.c,v 1.7 2002/09/30 22:33:19 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ei.c,v 1.6 2002/09/27 20:41:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ei.c,v 1.7 2002/09/30 22:33:19 thorpej Exp $");
#include <sys/param.h>
@@ -85,9 +85,8 @@ struct ei_softc {
struct evcnt sc_intrcnt;
};
-const struct cfattach ei_ca = {
- sizeof(struct ei_softc), ei_match, ei_attach
-};
+CFATTACH_DECL(ei, sizeof(struct ei_softc),
+ ei_match, ei_attach, NULL, NULL)
static inline void
ei_setpage(struct ei_softc *sc, int page)
diff --git a/sys/dev/podulebus/oak.c b/sys/dev/podulebus/oak.c
index 289442bd64b..3d449e904bc 100644
--- a/sys/dev/podulebus/oak.c
+++ b/sys/dev/podulebus/oak.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oak.c,v 1.10 2002/09/27 20:41:14 thorpej Exp $ */
+/* $NetBSD: oak.c,v 1.11 2002/09/30 22:33:19 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oak.c,v 1.10 2002/09/27 20:41:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oak.c,v 1.11 2002/09/30 22:33:19 thorpej Exp $");
#include <sys/param.h>
@@ -109,9 +109,8 @@ struct oak_softc {
bus_space_handle_t sc_pdmah;
};
-const struct cfattach oak_ca = {
- sizeof(struct oak_softc), oak_match, oak_attach
-};
+CFATTACH_DECL(oak, sizeof(struct oak_softc),
+ oak_match, oak_attach, NULL, NULL)
/*
* Card probe function
diff --git a/sys/dev/qbus/dhu.c b/sys/dev/qbus/dhu.c
index 75591f35c54..e968c0c2c09 100644
--- a/sys/dev/qbus/dhu.c
+++ b/sys/dev/qbus/dhu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dhu.c,v 1.29 2002/09/27 20:41:15 thorpej Exp $ */
+/* $NetBSD: dhu.c,v 1.30 2002/09/30 22:42:10 thorpej Exp $ */
/*
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.29 2002/09/27 20:41:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.30 2002/09/30 22:42:10 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,9 +147,8 @@ static int dhuparam __P((struct tty *, struct termios *));
static int dhuiflow __P((struct tty *, int));
static unsigned dhumctl __P((struct dhu_softc *,int, int, int));
-const struct cfattach dhu_ca = {
- sizeof(struct dhu_softc), dhu_match, dhu_attach
-};
+CFATTACH_DECL(dhu, sizeof(struct dhu_softc),
+ dhu_match, dhu_attach, NULL, NULL)
dev_type_open(dhuopen);
dev_type_close(dhuclose);
diff --git a/sys/dev/qbus/dl.c b/sys/dev/qbus/dl.c
index 2abb9f25804..c944b96f3dc 100644
--- a/sys/dev/qbus/dl.c
+++ b/sys/dev/qbus/dl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dl.c,v 1.23 2002/09/27 20:41:15 thorpej Exp $ */
+/* $NetBSD: dl.c,v 1.24 2002/09/30 22:42:10 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.23 2002/09/27 20:41:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.24 2002/09/30 22:42:10 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,9 +121,8 @@ static void dlstart (struct tty *);
static int dlparam (struct tty *, struct termios *);
static void dlbrk (struct dl_softc *, int);
-const struct cfattach dl_ca = {
- sizeof(struct dl_softc), dl_match, dl_attach
-};
+CFATTACH_DECL(dl, sizeof(struct dl_softc),
+ dl_match, dl_attach, NULL, NULL)
dev_type_open(dlopen);
dev_type_close(dlclose);
diff --git a/sys/dev/qbus/dz_uba.c b/sys/dev/qbus/dz_uba.c
index 7a51ba7955a..00a2c7eca9e 100644
--- a/sys/dev/qbus/dz_uba.c
+++ b/sys/dev/qbus/dz_uba.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_uba.c,v 1.17 2002/09/27 20:41:16 thorpej Exp $ */
+/* $NetBSD: dz_uba.c,v 1.18 2002/09/30 22:42:11 thorpej Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved.
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.17 2002/09/27 20:41:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.18 2002/09/30 22:42:11 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,9 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.17 2002/09/27 20:41:16 thorpej Exp $");
static int dz_uba_match __P((struct device *, struct cfdata *, void *));
static void dz_uba_attach __P((struct device *, struct device *, void *));
-const struct cfattach dz_uba_ca = {
- sizeof(struct dz_softc), dz_uba_match, dz_uba_attach
-};
+CFATTACH_DECL(dz_uba, sizeof(struct dz_softc),
+ dz_uba_match, dz_uba_attach, NULL, NULL)
/* Autoconfig handles: setup the controller to interrupt, */
/* then complete the housecleaning for full operation */
diff --git a/sys/dev/qbus/if_de.c b/sys/dev/qbus/if_de.c
index 8f85be52478..6a6d5336bc0 100644
--- a/sys/dev/qbus/if_de.c
+++ b/sys/dev/qbus/if_de.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.12 2002/09/27 20:41:16 thorpej Exp $ */
+/* $NetBSD: if_de.c,v 1.13 2002/09/30 22:42:11 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.12 2002/09/27 20:41:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.13 2002/09/30 22:42:11 thorpej Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -155,9 +155,8 @@ static void derecv(struct de_softc *);
static void deintr(void *);
static void deshutdown(void *);
-const struct cfattach de_ca = {
- sizeof(struct de_softc), dematch, deattach
-};
+CFATTACH_DECL(de, sizeof(struct de_softc),
+ dematch, deattach, NULL, NULL)
#define DE_WCSR(csr, val) \
bus_space_write_2(sc->sc_iot, sc->sc_ioh, csr, val)
diff --git a/sys/dev/qbus/if_dmc.c b/sys/dev/qbus/if_dmc.c
index b00705d2347..8dd3023665f 100644
--- a/sys/dev/qbus/if_dmc.c
+++ b/sys/dev/qbus/if_dmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dmc.c,v 1.4 2002/09/27 20:41:17 thorpej Exp $ */
+/* $NetBSD: if_dmc.c,v 1.5 2002/09/30 22:42:11 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.4 2002/09/27 20:41:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.5 2002/09/30 22:42:11 thorpej Exp $");
#undef DMCDEBUG /* for base table dump on fatal error */
@@ -187,9 +187,8 @@ static int dmcoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
struct rtentry *);
static void dmcreset(struct device *);
-const struct cfattach dmc_ca = {
- sizeof(struct dmc_softc), dmcmatch, dmcattach
-};
+CFATTACH_DECL(dmc, sizeof(struct dmc_softc),
+ dmcmatch, dmcattach, NULL, NULL)
/* flags */
#define DMC_RUNNING 0x01 /* device initialized */
diff --git a/sys/dev/qbus/if_il.c b/sys/dev/qbus/if_il.c
index 91a4952eb49..2291434f425 100644
--- a/sys/dev/qbus/if_il.c
+++ b/sys/dev/qbus/if_il.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_il.c,v 1.6 2002/09/27 20:41:17 thorpej Exp $ */
+/* $NetBSD: if_il.c,v 1.7 2002/09/30 22:42:11 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.6 2002/09/27 20:41:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.7 2002/09/30 22:42:11 thorpej Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -132,9 +132,8 @@ static void ilwatch(struct ifnet *);
static void iltotal(struct il_softc *);
static void ilstop(struct ifnet *, int);
-const struct cfattach il_ca = {
- sizeof(struct il_softc), ilmatch, ilattach
-};
+CFATTACH_DECL(il, sizeof(struct il_softc),
+ ilmatch, ilattach, NULL, NULL)
#define IL_WCSR(csr, val) \
bus_space_write_2(sc->sc_iot, sc->sc_ioh, csr, val)
diff --git a/sys/dev/qbus/if_qe.c b/sys/dev/qbus/if_qe.c
index 7f65c96a889..6bb497cc41e 100644
--- a/sys/dev/qbus/if_qe.c
+++ b/sys/dev/qbus/if_qe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qe.c,v 1.53 2002/09/27 20:41:18 thorpej Exp $ */
+/* $NetBSD: if_qe.c,v 1.54 2002/09/30 22:42:11 thorpej Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.53 2002/09/27 20:41:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.54 2002/09/30 22:42:11 thorpej Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -114,9 +114,8 @@ static int qe_add_rxbuf(struct qe_softc *, int);
static void qe_setup(struct qe_softc *);
static void qetimeout(struct ifnet *);
-const struct cfattach qe_ca = {
- sizeof(struct qe_softc), qematch, qeattach
-};
+CFATTACH_DECL(qe, sizeof(struct qe_softc),
+ qematch, qeattach, NULL, NULL)
#define QE_WCSR(csr, val) \
bus_space_write_2(sc->sc_iot, sc->sc_ioh, csr, val)
diff --git a/sys/dev/qbus/qd.c b/sys/dev/qbus/qd.c
index c9dd24eb272..cc03b3e2b76 100644
--- a/sys/dev/qbus/qd.c
+++ b/sys/dev/qbus/qd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qd.c,v 1.26 2002/09/27 20:41:19 thorpej Exp $ */
+/* $NetBSD: qd.c,v 1.27 2002/09/30 22:42:11 thorpej Exp $ */
/*-
* Copyright (c) 1988 Regents of the University of California.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.26 2002/09/27 20:41:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.27 2002/09/30 22:42:11 thorpej Exp $");
#include "opt_ddb.h"
@@ -537,9 +537,8 @@ qdcninit(cndev)
} /* qdcninit */
/* see <sys/device.h> */
-const struct cfattach qd_ca = {
- sizeof(struct qd_softc), qd_match, qd_attach
-};
+CFATTACH_DECL(qd, sizeof(struct qd_softc),
+ qd_match, qd_attach, NULL, NULL)
#define QD_RCSR(reg) \
bus_space_read_2(sc->sc_iot, sc->sc_ioh, reg)
diff --git a/sys/dev/qbus/rl.c b/sys/dev/qbus/rl.c
index 1641702fa21..29fa789c20e 100644
--- a/sys/dev/qbus/rl.c
+++ b/sys/dev/qbus/rl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rl.c,v 1.14 2002/09/27 20:41:20 thorpej Exp $ */
+/* $NetBSD: rl.c,v 1.15 2002/09/30 22:42:11 thorpej Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.14 2002/09/27 20:41:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.15 2002/09/30 22:42:11 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -78,13 +78,11 @@ static void rlcstart(struct rlc_softc *, struct buf *);
static void waitcrdy(struct rlc_softc *);
static void rlcreset(struct device *);
-const struct cfattach rlc_ca = {
- sizeof(struct rlc_softc), rlcmatch, rlcattach
-};
+CFATTACH_DECL(rlc, sizeof(struct rlc_softc),
+ rlcmatch, rlcattach, NULL, NULL)
-const struct cfattach rl_ca = {
- sizeof(struct rl_softc), rlmatch, rlattach
-};
+CFATTACH_DECL(rl, sizeof(struct rl_softc),
+ rlmatch, rlattach, NULL, NULL)
dev_type_open(rlopen);
dev_type_close(rlclose);
diff --git a/sys/dev/qbus/ts.c b/sys/dev/qbus/ts.c
index e8426348e93..e497454f74e 100644
--- a/sys/dev/qbus/ts.c
+++ b/sys/dev/qbus/ts.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ts.c,v 1.7 2002/09/27 20:41:21 thorpej Exp $ */
+/* $NetBSD: ts.c,v 1.8 2002/09/30 22:42:11 thorpej Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.7 2002/09/27 20:41:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.8 2002/09/30 22:42:11 thorpej Exp $");
#undef TSDEBUG
@@ -168,9 +168,8 @@ static int tsmatch(struct device *, struct cfdata *, void *);
static void tsattach(struct device *, struct device *, void *);
static int tsready(struct uba_unit *);
-const struct cfattach ts_ca = {
- sizeof(struct ts_softc), tsmatch, tsattach
-};
+CFATTACH_DECL(ts, sizeof(struct ts_softc),
+ tsmatch, tsattach, NULL, NULL)
dev_type_open(tsopen);
dev_type_close(tsclose);
diff --git a/sys/dev/qbus/uda.c b/sys/dev/qbus/uda.c
index 9fd67344a9d..35475fd128a 100644
--- a/sys/dev/qbus/uda.c
+++ b/sys/dev/qbus/uda.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uda.c,v 1.45 2002/09/27 20:41:21 thorpej Exp $ */
+/* $NetBSD: uda.c,v 1.46 2002/09/30 22:42:11 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.45 2002/09/27 20:41:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.46 2002/09/30 22:42:11 thorpej Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -89,13 +89,11 @@ static int udaprint(void *, const char *);
static void udasaerror(struct device *, int);
static void udago(struct device *, struct mscp_xi *);
-const struct cfattach mtc_ca = {
- sizeof(struct uda_softc), udamatch, udaattach
-};
+CFATTACH_DECL(mtc, sizeof(struct uda_softc),
+ udamatch, udaattach, NULL, NULL)
-const struct cfattach uda_ca = {
- sizeof(struct uda_softc), udamatch, udaattach
-};
+CFATTACH_DECL(uda, sizeof(struct uda_softc),
+ udamatch, udaattach, NULL, NULL)
/*
* More driver definitions, for generic MSCP code.