From ab29a17b645ba95aa2dc113c6b906cb95ca6dd13 Mon Sep 17 00:00:00 2001 From: thorpej Date: Tue, 1 Oct 2002 01:05:50 +0000 Subject: [PATCH] Use CFATTACH_DECL(). --- sys/dev/sun/kbd_zs.c | 9 ++++----- sys/dev/sun/ms_zs.c | 9 ++++----- sys/dev/sun/sunkbd.c | 9 ++++----- sys/dev/sun/sunms.c | 9 ++++----- sys/dev/tc/asc_tc.c | 9 ++++----- sys/dev/tc/asc_tcds.c | 10 ++++------ sys/dev/tc/bba.c | 9 ++++----- sys/dev/tc/cfb.c | 9 ++++----- sys/dev/tc/if_fta.c | 7 ++++--- sys/dev/tc/if_le_ioasic.c | 9 ++++----- sys/dev/tc/if_le_tc.c | 9 ++++----- sys/dev/tc/mfb.c | 9 ++++----- sys/dev/tc/px.c | 9 ++++----- sys/dev/tc/pxg.c | 9 ++++----- sys/dev/tc/sfb.c | 9 ++++----- sys/dev/tc/sfbplus.c | 9 ++++----- sys/dev/tc/tc.c | 10 +++++----- sys/dev/tc/tcds.c | 9 ++++----- sys/dev/tc/tfb.c | 9 ++++----- sys/dev/tc/xcfb.c | 9 ++++----- sys/dev/tc/zs_ioasic.c | 9 ++++----- sys/dev/tc/zskbd.c | 9 ++++----- sys/dev/tc/zsms.c | 9 ++++----- 23 files changed, 93 insertions(+), 114 deletions(-) diff --git a/sys/dev/sun/kbd_zs.c b/sys/dev/sun/kbd_zs.c index c0497b706858..1df52f09b62f 100644 --- a/sys/dev/sun/kbd_zs.c +++ b/sys/dev/sun/kbd_zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd_zs.c,v 1.11 2002/09/27 20:41:52 thorpej Exp $ */ +/* $NetBSD: kbd_zs.c,v 1.12 2002/10/01 01:05:50 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.11 2002/09/27 20:41:52 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.12 2002/10/01 01:05:50 thorpej Exp $"); #include #include @@ -101,9 +101,8 @@ static int kbd_zs_match(struct device *, struct cfdata *, void *); static void kbd_zs_attach(struct device *, struct device *, void *); static void kbd_zs_write_data __P((struct kbd_softc *, int)); -const struct cfattach kbd_zs_ca = { - sizeof(struct kbd_softc), kbd_zs_match, kbd_zs_attach -}; +CFATTACH_DECL(kbd_zs, sizeof(struct kbd_softc), + kbd_zs_match, kbd_zs_attach, NULL, NULL) /* Fall-back baud rate */ int kbd_zs_bps = KBD_DEFAULT_BPS; diff --git a/sys/dev/sun/ms_zs.c b/sys/dev/sun/ms_zs.c index 553c79da5407..a594c82bd11b 100644 --- a/sys/dev/sun/ms_zs.c +++ b/sys/dev/sun/ms_zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ms_zs.c,v 1.7 2002/09/27 20:41:52 thorpej Exp $ */ +/* $NetBSD: ms_zs.c,v 1.8 2002/10/01 01:05:50 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -56,7 +56,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.7 2002/09/27 20:41:52 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.8 2002/10/01 01:05:50 thorpej Exp $"); #include #include @@ -100,9 +100,8 @@ int ms_zs_bps = MS_DEFAULT_BPS; static int ms_zs_match(struct device *, struct cfdata *, void *); static void ms_zs_attach(struct device *, struct device *, void *); -const struct cfattach ms_zs_ca = { - sizeof(struct ms_softc), ms_zs_match, ms_zs_attach -}; +CFATTACH_DECL(ms_zs, sizeof(struct ms_softc), + ms_zs_match, ms_zs_attach, NULL, NULL) /* * ms_match: how is this zs channel configured? diff --git a/sys/dev/sun/sunkbd.c b/sys/dev/sun/sunkbd.c index cd08a73945af..822aca6a8f26 100644 --- a/sys/dev/sun/sunkbd.c +++ b/sys/dev/sun/sunkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunkbd.c,v 1.10 2002/09/27 20:41:53 thorpej Exp $ */ +/* $NetBSD: sunkbd.c,v 1.11 2002/10/01 01:05:50 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -56,7 +56,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.10 2002/09/27 20:41:53 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.11 2002/10/01 01:05:50 thorpej Exp $"); #include #include @@ -99,9 +99,8 @@ int sunkbdstart(struct tty *); /* Default keyboard baud rate */ int sunkbd_bps = KBD_DEFAULT_BPS; -const struct cfattach kbd_ca = { - sizeof(struct kbd_softc), sunkbd_match, sunkbd_attach -}; +CFATTACH_DECL(kbd, sizeof(struct kbd_softc), + sunkbd_match, sunkbd_attach, NULL, NULL) struct linesw sunkbd_disc = { "sunkbd", 7, ttylopen, ttylclose, ttyerrio, ttyerrio, ttynullioctl, diff --git a/sys/dev/sun/sunms.c b/sys/dev/sun/sunms.c index 7ef8e14475ac..37b00394d06b 100644 --- a/sys/dev/sun/sunms.c +++ b/sys/dev/sun/sunms.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunms.c,v 1.9 2002/09/27 20:41:53 thorpej Exp $ */ +/* $NetBSD: sunms.c,v 1.10 2002/10/01 01:05:50 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -56,7 +56,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.9 2002/09/27 20:41:53 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.10 2002/10/01 01:05:50 thorpej Exp $"); #include #include @@ -94,9 +94,8 @@ static void sunms_attach(struct device *, struct device *, void *); static int sunmsiopen(struct device *, int mode); int sunmsinput(int, struct tty *); -const struct cfattach ms_ca = { - sizeof(struct ms_softc), sunms_match, sunms_attach -}; +CFATTACH_DECL(ms, sizeof(struct ms_softc), + sunms_match, sunms_attach, NULL, NULL) struct linesw sunms_disc = { "sunms", 8, ttylopen, ttylclose, ttyerrio, ttyerrio, ttynullioctl, diff --git a/sys/dev/tc/asc_tc.c b/sys/dev/tc/asc_tc.c index ef53d570ab2b..949c9949fd4b 100644 --- a/sys/dev/tc/asc_tc.c +++ b/sys/dev/tc/asc_tc.c @@ -1,4 +1,4 @@ -/* $NetBSD: asc_tc.c,v 1.20 2002/09/27 20:41:54 thorpej Exp $ */ +/* $NetBSD: asc_tc.c,v 1.21 2002/10/01 01:12:35 thorpej Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: asc_tc.c,v 1.20 2002/09/27 20:41:54 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asc_tc.c,v 1.21 2002/10/01 01:12:35 thorpej Exp $"); #include #include @@ -75,9 +75,8 @@ struct asc_softc { static int asc_tc_match __P((struct device *, struct cfdata *, void *)); static void asc_tc_attach __P((struct device *, struct device *, void *)); -const struct cfattach asc_tc_ca = { - sizeof(struct asc_softc), asc_tc_match, asc_tc_attach -}; +CFATTACH_DECL(asc_tc, sizeof(struct asc_softc), + asc_tc_match, asc_tc_attach, NULL, NULL) static u_char asc_read_reg __P((struct ncr53c9x_softc *, int)); static void asc_write_reg __P((struct ncr53c9x_softc *, int, u_char)); diff --git a/sys/dev/tc/asc_tcds.c b/sys/dev/tc/asc_tcds.c index 4a65146099f0..e951c4ca9124 100644 --- a/sys/dev/tc/asc_tcds.c +++ b/sys/dev/tc/asc_tcds.c @@ -1,4 +1,4 @@ -/* $NetBSD: asc_tcds.c,v 1.6 2002/09/27 20:41:55 thorpej Exp $ */ +/* $NetBSD: asc_tcds.c,v 1.7 2002/10/01 01:12:35 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.6 2002/09/27 20:41:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.7 2002/10/01 01:12:35 thorpej Exp $"); #include #include @@ -106,10 +106,8 @@ struct asc_softc { static int asc_tcds_match __P((struct device *, struct cfdata *, void *)); static void asc_tcds_attach __P((struct device *, struct device *, void *)); -/* Linkup to the rest of the kernel */ -const struct cfattach asc_tcds_ca = { - sizeof(struct asc_softc), asc_tcds_match, asc_tcds_attach -}; +CFATTACH_DECL(asc_tcds, sizeof(struct asc_softc), + asc_tcds_match, asc_tcds_attach, NULL, NULL) /* * Functions and the switch for the MI code. diff --git a/sys/dev/tc/bba.c b/sys/dev/tc/bba.c index 8f87350242a2..ec062ecf2bf9 100644 --- a/sys/dev/tc/bba.c +++ b/sys/dev/tc/bba.c @@ -1,4 +1,4 @@ -/* $NetBSD: bba.c,v 1.16 2002/09/27 20:41:55 thorpej Exp $ */ +/* $NetBSD: bba.c,v 1.17 2002/10/01 01:12:35 thorpej Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ /* maxine/alpha baseboard audio (bba) */ #include -__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.16 2002/09/27 20:41:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.17 2002/10/01 01:12:35 thorpej Exp $"); #include #include @@ -101,9 +101,8 @@ struct bba_softc { int bba_match __P((struct device *, struct cfdata *, void *)); void bba_attach __P((struct device *, struct device *, void *)); -const struct cfattach bba_ca = { - sizeof(struct bba_softc), bba_match, bba_attach -}; +CFATTACH_DECL(bba, sizeof(struct bba_softc), + bba_match, bba_attach, NULL, NULL) /* * Define our interface into the am7930 MI driver. diff --git a/sys/dev/tc/cfb.c b/sys/dev/tc/cfb.c index 71d57ab176d1..b92328e07d9c 100644 --- a/sys/dev/tc/cfb.c +++ b/sys/dev/tc/cfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: cfb.c,v 1.36 2002/08/19 13:05:42 itohy Exp $ */ +/* $NetBSD: cfb.c,v 1.37 2002/10/01 01:12:36 thorpej Exp $ */ /* * Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.36 2002/08/19 13:05:42 itohy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.37 2002/10/01 01:12:36 thorpej Exp $"); #include #include @@ -139,9 +139,8 @@ struct cfb_softc { static int cfbmatch __P((struct device *, struct cfdata *, void *)); static void cfbattach __P((struct device *, struct device *, void *)); -const struct cfattach cfb_ca = { - sizeof(struct cfb_softc), cfbmatch, cfbattach, -}; +CFATTACH_DECL(cfb, sizeof(struct cfb_softc), + cfbmatch, cfbattach, NULL, NULL) static void cfb_common_init __P((struct rasops_info *)); static struct rasops_info cfb_console_ri; diff --git a/sys/dev/tc/if_fta.c b/sys/dev/tc/if_fta.c index 947cc3324ee5..2c1068f32119 100644 --- a/sys/dev/tc/if_fta.c +++ b/sys/dev/tc/if_fta.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fta.c,v 1.20 2002/09/27 20:41:55 thorpej Exp $ */ +/* $NetBSD: if_fta.c,v 1.21 2002/10/01 01:12:36 thorpej Exp $ */ /*- * Copyright (c) 1996 Matt Thomas @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.20 2002/09/27 20:41:55 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.21 2002/10/01 01:12:36 thorpej Exp $"); #include "opt_inet.h" @@ -120,4 +120,5 @@ pdq_tc_attach( printf("%s: warning: couldn't establish shutdown hook\n", self->dv_xname); } -const struct cfattach fta_ca = { sizeof(pdq_softc_t), pdq_tc_match, pdq_tc_attach }; +CFATTACH_DECL(fta, sizeof(pdq_softc_t), + pdq_tc_match, pdq_tc_attach, NULL, NULL) diff --git a/sys/dev/tc/if_le_ioasic.c b/sys/dev/tc/if_le_ioasic.c index cf4093effd9a..318beda91ec5 100644 --- a/sys/dev/tc/if_le_ioasic.c +++ b/sys/dev/tc/if_le_ioasic.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_ioasic.c,v 1.19 2002/09/27 20:41:56 thorpej Exp $ */ +/* $NetBSD: if_le_ioasic.c,v 1.20 2002/10/01 01:12:36 thorpej Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_le_ioasic.c,v 1.19 2002/09/27 20:41:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_ioasic.c,v 1.20 2002/10/01 01:12:36 thorpej Exp $"); #include "opt_inet.h" @@ -74,9 +74,8 @@ struct le_ioasic_softc { static int le_ioasic_match __P((struct device *, struct cfdata *, void *)); static void le_ioasic_attach __P((struct device *, struct device *, void *)); -const struct cfattach le_ioasic_ca = { - sizeof(struct le_softc), le_ioasic_match, le_ioasic_attach -}; +CFATTACH_DECL(le_ioasic, sizeof(struct le_softc), + le_ioasic_match, le_ioasic_attach, NULL, NULL) static void le_ioasic_copytobuf_gap2 __P((struct lance_softc *, void *, int, int)); diff --git a/sys/dev/tc/if_le_tc.c b/sys/dev/tc/if_le_tc.c index 2b6e157ac756..aee1781aa442 100644 --- a/sys/dev/tc/if_le_tc.c +++ b/sys/dev/tc/if_le_tc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_tc.c,v 1.13 2002/09/27 20:41:56 thorpej Exp $ */ +/* $NetBSD: if_le_tc.c,v 1.14 2002/10/01 01:12:36 thorpej Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_le_tc.c,v 1.13 2002/09/27 20:41:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_tc.c,v 1.14 2002/10/01 01:12:36 thorpej Exp $"); #include "opt_inet.h" @@ -63,9 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_tc.c,v 1.13 2002/09/27 20:41:56 thorpej Exp $" int le_tc_match __P((struct device *, struct cfdata *, void *)); void le_tc_attach __P((struct device *, struct device *, void *)); -const struct cfattach le_tc_ca = { - sizeof(struct le_softc), le_tc_match, le_tc_attach -}; +CFATTACH_DECL(le_tc, sizeof(struct le_softc), + le_tc_match, le_tc_attach, NULL, NULL) #define LE_OFFSET_RAM 0x0 #define LE_OFFSET_LANCE 0x100000 diff --git a/sys/dev/tc/mfb.c b/sys/dev/tc/mfb.c index d3b1e4cec52a..0ceef43fe6f1 100644 --- a/sys/dev/tc/mfb.c +++ b/sys/dev/tc/mfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: mfb.c,v 1.33 2002/07/04 14:37:13 junyoung Exp $ */ +/* $NetBSD: mfb.c,v 1.34 2002/10/01 01:12:37 thorpej Exp $ */ /* * Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.33 2002/07/04 14:37:13 junyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.34 2002/10/01 01:12:37 thorpej Exp $"); #include #include @@ -131,9 +131,8 @@ struct mfb_softc { static int mfbmatch __P((struct device *, struct cfdata *, void *)); static void mfbattach __P((struct device *, struct device *, void *)); -const struct cfattach mfb_ca = { - sizeof(struct mfb_softc), mfbmatch, mfbattach, -}; +CFATTACH_DECL(mfb, sizeof(struct mfb_softc), + mfbmatch, mfbattach, NULL, NULL) static void mfb_common_init __P((struct rasops_info *)); static struct rasops_info mfb_console_ri; diff --git a/sys/dev/tc/px.c b/sys/dev/tc/px.c index 39be2ff98b2e..88583c5aa6b4 100644 --- a/sys/dev/tc/px.c +++ b/sys/dev/tc/px.c @@ -1,4 +1,4 @@ -/* $NetBSD: px.c,v 1.15 2002/09/27 20:41:56 thorpej Exp $ */ +/* $NetBSD: px.c,v 1.16 2002/10/01 01:12:37 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.15 2002/09/27 20:41:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.16 2002/10/01 01:12:37 thorpej Exp $"); #include #include @@ -114,9 +114,8 @@ struct px_softc { volatile u_int32_t *px_qpoll[PX_BUF_COUNT]; }; -const struct cfattach px_ca = { - sizeof(struct px_softc), px_match, px_attach -}; +CFATTACH_DECL(px, sizeof(struct px_softc), + px_match, px_attach, NULL, NULL) int px_match(struct device *parent, struct cfdata *match, void *aux) diff --git a/sys/dev/tc/pxg.c b/sys/dev/tc/pxg.c index 8dc022cbab55..1309bef6b954 100644 --- a/sys/dev/tc/pxg.c +++ b/sys/dev/tc/pxg.c @@ -1,4 +1,4 @@ -/* $NetBSD: pxg.c,v 1.11 2002/09/27 20:41:57 thorpej Exp $ */ +/* $NetBSD: pxg.c,v 1.12 2002/10/01 01:12:37 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.11 2002/09/27 20:41:57 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.12 2002/10/01 01:12:37 thorpej Exp $"); #include #include @@ -104,9 +104,8 @@ struct pxg_softc { struct stic_info *pxg_si; }; -const struct cfattach pxg_ca = { - sizeof(struct pxg_softc), pxg_match, pxg_attach -}; +CFATTACH_DECL(pxg, sizeof(struct pxg_softc), + pxg_match, pxg_attach, NULL, NULL) static const char *pxg_types[] = { "PMAG-DA ", diff --git a/sys/dev/tc/sfb.c b/sys/dev/tc/sfb.c index a31649de53e6..f43b87325ef3 100644 --- a/sys/dev/tc/sfb.c +++ b/sys/dev/tc/sfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: sfb.c,v 1.55 2002/08/19 13:05:43 itohy Exp $ */ +/* $NetBSD: sfb.c,v 1.56 2002/10/01 01:12:37 thorpej Exp $ */ /* * Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.55 2002/08/19 13:05:43 itohy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.56 2002/10/01 01:12:37 thorpej Exp $"); #include #include @@ -135,9 +135,8 @@ struct sfb_softc { static int sfbmatch __P((struct device *, struct cfdata *, void *)); static void sfbattach __P((struct device *, struct device *, void *)); -const struct cfattach sfb_ca = { - sizeof(struct sfb_softc), sfbmatch, sfbattach, -}; +CFATTACH_DECL(sfb, sizeof(struct sfb_softc), + sfbmatch, sfbattach, NULL, NULL) static void sfb_common_init __P((struct rasops_info *)); static struct rasops_info sfb_console_ri; diff --git a/sys/dev/tc/sfbplus.c b/sys/dev/tc/sfbplus.c index c9e1d7570562..e47b87a4ac3d 100644 --- a/sys/dev/tc/sfbplus.c +++ b/sys/dev/tc/sfbplus.c @@ -1,4 +1,4 @@ -/* $NetBSD: sfbplus.c,v 1.16 2002/08/19 13:05:43 itohy Exp $ */ +/* $NetBSD: sfbplus.c,v 1.17 2002/10/01 01:12:38 thorpej Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Tohru Nishimura. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.16 2002/08/19 13:05:43 itohy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.17 2002/10/01 01:12:38 thorpej Exp $"); #include #include @@ -126,9 +126,8 @@ struct sfbp_softc { static int sfbpmatch __P((struct device *, struct cfdata *, void *)); static void sfbpattach __P((struct device *, struct device *, void *)); -const struct cfattach sfbp_ca = { - sizeof(struct sfbp_softc), sfbpmatch, sfbpattach, -}; +CFATTACH_DECL(sfbp, sizeof(struct sfbp_softc), + sfbpmatch, sfbpattach, NULL, NULL) static void sfbp_common_init __P((struct rasops_info *)); static struct rasops_info sfbp_console_ri; diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c index 581d1f12bec6..4b3644cd87e7 100644 --- a/sys/dev/tc/tc.c +++ b/sys/dev/tc/tc.c @@ -1,4 +1,4 @@ -/* $NetBSD: tc.c,v 1.32 2002/09/27 20:41:57 thorpej Exp $ */ +/* $NetBSD: tc.c,v 1.33 2002/10/01 01:12:38 thorpej Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.32 2002/09/27 20:41:57 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.33 2002/10/01 01:12:38 thorpej Exp $"); #include "opt_tcverbose.h" @@ -45,9 +45,9 @@ __KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.32 2002/09/27 20:41:57 thorpej Exp $"); int tcmatch __P((struct device *, struct cfdata *, void *)); void tcattach __P((struct device *, struct device *, void *)); -const struct cfattach tc_ca = { - sizeof(struct tc_softc), tcmatch, tcattach -}; +CFATTACH_DECL(tc, sizeof(struct tc_softc), + tcmatch, tcattach, NULL, NULL) + extern struct cfdriver tc_cd; int tcprint __P((void *, const char *)); diff --git a/sys/dev/tc/tcds.c b/sys/dev/tc/tcds.c index aecc423038d4..4340f6c76ff7 100644 --- a/sys/dev/tc/tcds.c +++ b/sys/dev/tc/tcds.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcds.c,v 1.7 2002/09/29 23:23:59 wiz Exp $ */ +/* $NetBSD: tcds.c,v 1.8 2002/10/01 01:12:38 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.7 2002/09/29 23:23:59 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.8 2002/10/01 01:12:38 thorpej Exp $"); #include #include @@ -111,9 +111,8 @@ void tcdsattach __P((struct device *, struct device *, void *)); int tcdsprint __P((void *, const char *)); int tcdssubmatch __P((struct device *, struct cfdata *, void *)); -const struct cfattach tcds_ca = { - sizeof(struct tcds_softc), tcdsmatch, tcdsattach, -}; +CFATTACH_DECL(tcds, sizeof(struct tcds_softc), + tcdsmatch, tcdsattach, NULL, NULL) /*static*/ int tcds_intr __P((void *)); /*static*/ int tcds_intrnull __P((void *)); diff --git a/sys/dev/tc/tfb.c b/sys/dev/tc/tfb.c index 8aae31c40ff4..8e542dcc0885 100644 --- a/sys/dev/tc/tfb.c +++ b/sys/dev/tc/tfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: tfb.c,v 1.36 2002/08/19 13:05:44 itohy Exp $ */ +/* $NetBSD: tfb.c,v 1.37 2002/10/01 01:12:38 thorpej Exp $ */ /* * Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.36 2002/08/19 13:05:44 itohy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.37 2002/10/01 01:12:38 thorpej Exp $"); #include #include @@ -200,9 +200,8 @@ struct tfb_softc { static int tfbmatch __P((struct device *, struct cfdata *, void *)); static void tfbattach __P((struct device *, struct device *, void *)); -const struct cfattach tfb_ca = { - sizeof(struct tfb_softc), tfbmatch, tfbattach, -}; +CFATTACH_DECL(tfb, sizeof(struct tfb_softc), + tfbmatch, tfbattach, NULL, NULL) static void tfb_common_init __P((struct rasops_info *)); static struct rasops_info tfb_console_ri; diff --git a/sys/dev/tc/xcfb.c b/sys/dev/tc/xcfb.c index 8aafd1e9510a..88f571ad163f 100644 --- a/sys/dev/tc/xcfb.c +++ b/sys/dev/tc/xcfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: xcfb.c,v 1.30 2002/08/19 13:05:45 itohy Exp $ */ +/* $NetBSD: xcfb.c,v 1.31 2002/10/01 01:12:39 thorpej Exp $ */ /* * Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.30 2002/08/19 13:05:45 itohy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.31 2002/10/01 01:12:39 thorpej Exp $"); #include #include @@ -98,9 +98,8 @@ struct xcfb_softc { static int xcfbmatch __P((struct device *, struct cfdata *, void *)); static void xcfbattach __P((struct device *, struct device *, void *)); -const struct cfattach xcfb_ca = { - sizeof(struct xcfb_softc), xcfbmatch, xcfbattach, -}; +CFATTACH_DECL(xcfb, sizeof(struct xcfb_softc), + xcfbmatch, xcfbattach, NULL, NULL) static tc_addr_t xcfb_consaddr; static struct rasops_info xcfb_console_ri; diff --git a/sys/dev/tc/zs_ioasic.c b/sys/dev/tc/zs_ioasic.c index 80467c3a71de..4d12ca0cec7b 100644 --- a/sys/dev/tc/zs_ioasic.c +++ b/sys/dev/tc/zs_ioasic.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs_ioasic.c,v 1.17 2002/09/27 20:41:58 thorpej Exp $ */ +/* $NetBSD: zs_ioasic.c,v 1.18 2002/10/01 01:12:39 thorpej Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.17 2002/09/27 20:41:58 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.18 2002/10/01 01:12:39 thorpej Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -196,9 +196,8 @@ void zs_ioasic_attach __P((struct device *, struct device *, void *)); int zs_ioasic_print __P((void *, const char *name)); int zs_ioasic_submatch __P((struct device *, struct cfdata *, void *)); -const struct cfattach zsc_ioasic_ca = { - sizeof(struct zsc_softc), zs_ioasic_match, zs_ioasic_attach -}; +CFATTACH_DECL(zsc_ioasic, sizeof(struct zsc_softc), + zs_ioasic_match, zs_ioasic_attach, NULL, NULL) /* Interrupt handlers. */ int zs_ioasic_hardintr __P((void *)); diff --git a/sys/dev/tc/zskbd.c b/sys/dev/tc/zskbd.c index 2a91cf965aac..ced148c745ed 100644 --- a/sys/dev/tc/zskbd.c +++ b/sys/dev/tc/zskbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: zskbd.c,v 1.6 2002/09/27 20:41:59 thorpej Exp $ */ +/* $NetBSD: zskbd.c,v 1.7 2002/10/01 01:12:39 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -49,7 +49,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.6 2002/09/27 20:41:59 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.7 2002/10/01 01:12:39 thorpej Exp $"); #include #include @@ -127,9 +127,8 @@ static void zskbd_input __P((struct zskbd_softc *, int)); static int zskbd_match __P((struct device *, struct cfdata *, void *)); static void zskbd_attach __P((struct device *, struct device *, void *)); -const struct cfattach zskbd_ca = { - sizeof(struct zskbd_softc), zskbd_match, zskbd_attach, -}; +CFATTACH_DECL(zskbd, sizeof(struct zskbd_softc), + zskbd_match, zskbd_attach, NULL, NULL) static int zskbd_enable __P((void *, int)); static void zskbd_set_leds __P((void *, int)); diff --git a/sys/dev/tc/zsms.c b/sys/dev/tc/zsms.c index f15d88e111c9..6ec986154391 100644 --- a/sys/dev/tc/zsms.c +++ b/sys/dev/tc/zsms.c @@ -1,4 +1,4 @@ -/* $NetBSD: zsms.c,v 1.7 2002/09/27 20:41:59 thorpej Exp $ */ +/* $NetBSD: zsms.c,v 1.8 2002/10/01 01:12:39 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -49,7 +49,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.7 2002/09/27 20:41:59 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.8 2002/10/01 01:12:39 thorpej Exp $"); #include #include @@ -118,9 +118,8 @@ static int zsms_match __P((struct device *, struct cfdata *, void *)); static void zsms_attach __P((struct device *, struct device *, void *)); static void zsms_input __P((void *, int)); -const struct cfattach zsms_ca = { - sizeof(struct zsms_softc), zsms_match, zsms_attach, -}; +CFATTACH_DECL(zsms, sizeof(struct zsms_softc), + zsms_match, zsms_attach, NULL, NULL) static int zsms_enable __P((void *)); static int zsms_ioctl __P((void *, u_long, caddr_t, int, struct proc *));