summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2002-10-01 04:21:32 +0000
committerthorpej <thorpej@NetBSD.org>2002-10-01 04:21:32 +0000
commitf59e5352f2c8167e537b9f9ade76e9eb736b2ef6 (patch)
tree17d648f8996a78ea29dc7d30750335bebf7cf626 /sys
parentc3cbda0efb3b329d205eb2c08351e4ecb1c7ae42 (diff)
Use CFATTACH_DECL().
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/arm/footbridge/isa/dsrtc.c7
-rw-r--r--sys/arch/arm/footbridge/isa/sysbeep_isa.c7
-rw-r--r--sys/arch/arm/iomd/console/console.c12
-rw-r--r--sys/arch/arm/iomd/console/vidcconsole.c7
-rw-r--r--sys/arch/evbmips/alchemy/dev/aupcmcia.c7
-rw-r--r--sys/arch/evbmips/malta/dev/gt.c7
-rw-r--r--sys/arch/evbmips/malta/dev/mainbus.c7
-rw-r--r--sys/arch/x86_64/isa/clock.c7
-rw-r--r--sys/arch/x86_64/isa/pccons.c12
-rw-r--r--sys/arch/x86_64/pci/pchb.c7
-rw-r--r--sys/arch/x86_64/pci/pcib.c7
-rw-r--r--sys/arch/x86_64/x86_64/mainbus.c7
-rw-r--r--sys/dev/pci/bktr/bktr_os.c9
13 files changed, 44 insertions, 59 deletions
diff --git a/sys/arch/arm/footbridge/isa/dsrtc.c b/sys/arch/arm/footbridge/isa/dsrtc.c
index 41379ae9830..9e2c1c27490 100644
--- a/sys/arch/arm/footbridge/isa/dsrtc.c
+++ b/sys/arch/arm/footbridge/isa/dsrtc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dsrtc.c,v 1.2 2002/09/27 20:30:37 thorpej Exp $ */
+/* $NetBSD: dsrtc.c,v 1.3 2002/10/01 04:26:54 thorpej Exp $ */
/*
* Copyright (c) 1998 Mark Brinicombe.
@@ -194,9 +194,8 @@ dsrtc_read(arg, rtc)
}
/* device and attach structures */
-const struct cfattach dsrtc_ca = {
- sizeof(struct dsrtc_softc), dsrtcmatch, dsrtcattach
-};
+CFATTACH_DECL(dsrtc, sizeof(struct dsrtc_softc),
+ dsrtcmatch, dsrtcattach, NULL, NULL)
/*
* dsrtcmatch()
diff --git a/sys/arch/arm/footbridge/isa/sysbeep_isa.c b/sys/arch/arm/footbridge/isa/sysbeep_isa.c
index 6a902a066b5..515ca7a5ecd 100644
--- a/sys/arch/arm/footbridge/isa/sysbeep_isa.c
+++ b/sys/arch/arm/footbridge/isa/sysbeep_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysbeep_isa.c,v 1.2 2002/09/27 20:30:38 thorpej Exp $ */
+/* $NetBSD: sysbeep_isa.c,v 1.3 2002/10/01 04:26:54 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -49,9 +49,8 @@ void sysbeep_isa_attach __P((struct device *parent, struct device *self, void *a
void sysbeep_isa __P((int pitch, int period));
/* device attach structure */
-const struct cfattach sysbeep_isa_ca = {
- sizeof(struct device), sysbeep_isa_match, sysbeep_isa_attach
-};
+CFATTACH_DECL(sysbeep_isa, sizeof(struct device),
+ sysbeep_isa_match, sysbeep_isa_attach, NULL, NULL)
static int ppi_attached;
static pcppi_tag_t ppicookie;
diff --git a/sys/arch/arm/iomd/console/console.c b/sys/arch/arm/iomd/console/console.c
index 03f1ce423f1..0edf5f71dcd 100644
--- a/sys/arch/arm/iomd/console/console.c
+++ b/sys/arch/arm/iomd/console/console.c
@@ -1,4 +1,4 @@
-/* $NetBSD: console.c,v 1.5 2002/09/27 20:30:44 thorpej Exp $ */
+/* $NetBSD: console.c,v 1.6 2002/10/01 04:25:30 thorpej Exp $ */
/*
* Copyright (c) 1994-1995 Melvyn Tang-Richardson
@@ -1242,16 +1242,14 @@ rpcattach(parent, self, aux)
}
/*
-const struct cfattach rpc_ca = {
- sizeof(struct device), rpcprobe, rpcattach
-};
+CFATTACH_DECL(rpc, sizeof(struct device),
+ rpcprobe, rpcattach, NULL, NULL)
extern struct cfdriver rpc_cd;
*/
-const struct cfattach vt_ca = {
- sizeof(struct device), rpcprobe, rpcattach
-};
+CFATTACH_DECL(vt, sizeof(struct device),
+ rpcprobe, rpcattach, NULL, NULL)
extern struct terminal_emulator vt220;
diff --git a/sys/arch/arm/iomd/console/vidcconsole.c b/sys/arch/arm/iomd/console/vidcconsole.c
index 0d2dde26637..9c443708fd8 100644
--- a/sys/arch/arm/iomd/console/vidcconsole.c
+++ b/sys/arch/arm/iomd/console/vidcconsole.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcconsole.c,v 1.5 2002/09/27 20:30:44 thorpej Exp $ */
+/* $NetBSD: vidcconsole.c,v 1.6 2002/10/01 04:25:30 thorpej Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -106,9 +106,8 @@ vidcconsole_attach(parent, self, aux)
(videomemory.vidm_type == VIDEOMEM_TYPE_VRAM) ? "VRAM" : "DRAM");
}
-const struct cfattach vidcconsole_ca = {
- sizeof (struct vidcconsole_softc), vidcconsole_probe, vidcconsole_attach
-};
+CFATTACH_DECL(vidcconsole, sizeof (struct vidcconsole_softc),
+ vidcconsole_probe, vidcconsole_attach, NULL, NULL)
extern struct cfdriver vidcconsole_cd;
diff --git a/sys/arch/evbmips/alchemy/dev/aupcmcia.c b/sys/arch/evbmips/alchemy/dev/aupcmcia.c
index d074ebf4c9b..7fa047705c1 100644
--- a/sys/arch/evbmips/alchemy/dev/aupcmcia.c
+++ b/sys/arch/evbmips/alchemy/dev/aupcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aupcmcia.c,v 1.3 2002/09/27 20:31:33 thorpej Exp $ */
+/* $NetBSD: aupcmcia.c,v 1.4 2002/10/01 04:21:32 thorpej Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -45,9 +45,8 @@
static int aupcmcia_match(struct device *, struct cfdata *, void *);
static void aupcmcia_attach(struct device *, struct device *, void *);
-const struct cfattach aupcmcia_ca = {
- sizeof (struct device), aupcmcia_match, aupcmcia_attach,
-};
+CFATTACH_DECL(aupcmcia, sizeof (struct device),
+ aupcmcia_match, aupcmcia_attach, NULL, NULL)
int
aupcmcia_match(struct device *parent, struct cfdata *match, void *aux)
diff --git a/sys/arch/evbmips/malta/dev/gt.c b/sys/arch/evbmips/malta/dev/gt.c
index dc2b73a1d6c..c97deec3cdf 100644
--- a/sys/arch/evbmips/malta/dev/gt.c
+++ b/sys/arch/evbmips/malta/dev/gt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.3 2002/09/27 20:31:34 thorpej Exp $ */
+/* $NetBSD: gt.c,v 1.4 2002/10/01 04:23:55 thorpej Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -88,9 +88,8 @@ static int gt_match(struct device *, struct cfdata *, void *);
static void gt_attach(struct device *, struct device *, void *);
static int gt_print(void *aux, const char *pnp);
-const struct cfattach gt_ca = {
- sizeof(struct device), gt_match, gt_attach
-};
+CFATTACH_DECL(gt, sizeof(struct device),
+ gt_match, gt_attach, NULL, NULL)
static int
gt_match(parent, match, aux)
diff --git a/sys/arch/evbmips/malta/dev/mainbus.c b/sys/arch/evbmips/malta/dev/mainbus.c
index 63b0aa416fc..e159a65f78f 100644
--- a/sys/arch/evbmips/malta/dev/mainbus.c
+++ b/sys/arch/evbmips/malta/dev/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.3 2002/09/27 20:31:35 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.4 2002/10/01 04:23:55 thorpej Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -69,9 +69,8 @@ static void mainbus_attach(struct device *, struct device *, void *);
static int mainbus_submatch(struct device *, struct cfdata *, void *);
static int mainbus_print(void *, const char *);
-const struct cfattach mainbus_ca = {
- sizeof(struct device), mainbus_match, mainbus_attach
-};
+CFATTACH_DECL(mainbus, sizeof(struct device),
+ mainbus_match, mainbus_attach, NULL, NULL)
/* There can be only one. */
int mainbus_found;
diff --git a/sys/arch/x86_64/isa/clock.c b/sys/arch/x86_64/isa/clock.c
index 89898e2b844..ce0d6a2f184 100644
--- a/sys/arch/x86_64/isa/clock.c
+++ b/sys/arch/x86_64/isa/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.4 2002/09/27 20:37:24 thorpej Exp $ */
+/* $NetBSD: clock.c,v 1.5 2002/10/01 04:31:18 thorpej Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -133,9 +133,8 @@ int clock_debug = 0;
int sysbeepmatch __P((struct device *, struct cfdata *, void *));
void sysbeepattach __P((struct device *, struct device *, void *));
-const struct cfattach sysbeep_ca = {
- sizeof(struct device), sysbeepmatch, sysbeepattach
-};
+CFATTACH_DECL(sysbeep, sizeof(struct device),
+ sysbeepmatch, sysbeepattach, NULL, NULL)
static int ppi_attached;
static pcppi_tag_t ppicookie;
diff --git a/sys/arch/x86_64/isa/pccons.c b/sys/arch/x86_64/isa/pccons.c
index 4a76a4343d1..3528e158605 100644
--- a/sys/arch/x86_64/isa/pccons.c
+++ b/sys/arch/x86_64/isa/pccons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.7 2002/09/27 20:37:24 thorpej Exp $ */
+/* $NetBSD: pccons.c,v 1.8 2002/10/01 04:31:18 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -205,9 +205,8 @@ void pcattach __P((struct device *, struct device *, void *));
int pcintr __P((void *));
void pcinit __P((void));
-const struct cfattach pc_ca = {
- sizeof(struct pc_softc), pcprobe, pcattach
-};
+CFATTACH_DECL(pc, sizeof(struct pc_softc),
+ pcprobe, pcattach, NULL, NULL)
extern struct cfdriver pc_cd;
@@ -220,9 +219,8 @@ int pcconskbdprobe __P((struct device *, struct cfdata *, void *));
void pcconskbdattach __P((struct device *, struct device *, void *));
void pcinput __P((void *, int));
-const struct cfattach pcconskbd_ca = {
- sizeof(struct pcconskbd_softc), pcconskbdprobe, pcconskbdattach
-};
+CFATTACH_DECL(pcconskbd, sizeof(struct pcconskbd_softc),
+ pcconskbdprobe, pcconskbdattach, NULL, NULL)
extern struct cfdriver pcconskbd_cd;
#endif
diff --git a/sys/arch/x86_64/pci/pchb.c b/sys/arch/x86_64/pci/pchb.c
index 077bc91b85e..0cd67d06fe2 100644
--- a/sys/arch/x86_64/pci/pchb.c
+++ b/sys/arch/x86_64/pci/pchb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.4 2002/09/27 20:37:25 thorpej Exp $ */
+/* $NetBSD: pchb.c,v 1.5 2002/10/01 04:31:19 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@@ -77,9 +77,8 @@ void pchbattach __P((struct device *, struct device *, void *));
int pchb_print __P((void *, const char *));
-const struct cfattach pchb_ca = {
- sizeof(struct pchb_softc), pchbmatch, pchbattach
-};
+CFATTACH_DECL(pchb, sizeof(struct pchb_softc),
+ pchbmatch, pchbattach, NULL, NULL)
int
pchbmatch(parent, match, aux)
diff --git a/sys/arch/x86_64/pci/pcib.c b/sys/arch/x86_64/pci/pcib.c
index 3a1954958bf..1999947b818 100644
--- a/sys/arch/x86_64/pci/pcib.c
+++ b/sys/arch/x86_64/pci/pcib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.2 2002/09/27 20:37:26 thorpej Exp $ */
+/* $NetBSD: pcib.c,v 1.3 2002/10/01 04:31:20 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -55,9 +55,8 @@
int pcibmatch __P((struct device *, struct cfdata *, void *));
void pcibattach __P((struct device *, struct device *, void *));
-const struct cfattach pcib_ca = {
- sizeof(struct device), pcibmatch, pcibattach
-};
+CFATTACH_DECL(pcib, sizeof(struct device),
+ pcibmatch, pcibattach, NULL, NULL)
void pcib_callback __P((struct device *));
int pcib_print __P((void *, const char *));
diff --git a/sys/arch/x86_64/x86_64/mainbus.c b/sys/arch/x86_64/x86_64/mainbus.c
index fe02d004f4c..9df125e1592 100644
--- a/sys/arch/x86_64/x86_64/mainbus.c
+++ b/sys/arch/x86_64/x86_64/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.3 2002/09/27 20:37:27 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.4 2002/10/01 04:31:20 thorpej Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -47,9 +47,8 @@
int mainbus_match __P((struct device *, struct cfdata *, void *));
void mainbus_attach __P((struct device *, struct device *, void *));
-const struct cfattach mainbus_ca = {
- sizeof(struct device), mainbus_match, mainbus_attach
-};
+CFATTACH_DECL(mainbus, sizeof(struct device),
+ mainbus_match, mainbus_attach, NULL, NULL)
int mainbus_print __P((void *, const char *));
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index ad42631bd3e..c8ed9a4621c 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bktr_os.c,v 1.30 2002/09/27 20:40:50 thorpej Exp $ */
+/* $NetBSD: bktr_os.c,v 1.31 2002/10/01 04:27:41 thorpej Exp $ */
/* FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp */
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.30 2002/09/27 20:40:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.31 2002/10/01 04:27:41 thorpej Exp $");
#ifdef __FreeBSD__
#include "bktr.h"
@@ -1330,9 +1330,8 @@ static int bktr_probe __P((struct device *, struct cfdata *, void *));
#endif
static void bktr_attach __P((struct device *, struct device *, void *));
-const struct cfattach bktr_ca = {
- sizeof(struct bktr_softc), bktr_probe, bktr_attach
-};
+CFATTACH_DECL(bktr, sizeof(struct bktr_softc),
+ bktr_probe, bktr_attach, NULL, NULL)
#if defined(__NetBSD__)
extern struct cfdriver bktr_cd;