summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2002-10-01 18:57:48 +0000
committerthorpej <thorpej@NetBSD.org>2002-10-01 18:57:48 +0000
commitc1077f220deda2004ccd4c0fb828fc8a3ccba09b (patch)
treee7db9ef8172e3f81531ec52ce9daeee13bf41061 /sys
parent34c3944c080d08c98b4aff70e888b76595f3ef20 (diff)
Use CFATTACH_DECL().
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc/dev/audioamd.c16
-rw-r--r--sys/arch/sparc/dev/bootbus.c7
-rw-r--r--sys/arch/sparc/dev/bwtwo_obio.c7
-rw-r--r--sys/arch/sparc/dev/cgeight.c7
-rw-r--r--sys/arch/sparc/dev/cgfour.c7
-rw-r--r--sys/arch/sparc/dev/cgfourteen.c7
-rw-r--r--sys/arch/sparc/dev/cgsix_obio.c7
-rw-r--r--sys/arch/sparc/dev/cgtwo.c7
-rw-r--r--sys/arch/sparc/dev/com_ebus.c7
-rw-r--r--sys/arch/sparc/dev/com_obio.c7
-rw-r--r--sys/arch/sparc/dev/dma_obio.c7
-rw-r--r--sys/arch/sparc/dev/ebus.c8
-rw-r--r--sys/arch/sparc/dev/esp_obio.c7
-rw-r--r--sys/arch/sparc/dev/fd.c18
-rw-r--r--sys/arch/sparc/dev/if_ie_obio.c7
-rw-r--r--sys/arch/sparc/dev/if_le_obio.c7
-rw-r--r--sys/arch/sparc/dev/obio.c8
-rw-r--r--sys/arch/sparc/dev/pckbc_js.c13
-rw-r--r--sys/arch/sparc/dev/power.c7
-rw-r--r--sys/arch/sparc/dev/rtc.c8
-rw-r--r--sys/arch/sparc/dev/sbus.c19
-rw-r--r--sys/arch/sparc/dev/sw.c7
-rw-r--r--sys/arch/sparc/dev/tctrl.c7
-rw-r--r--sys/arch/sparc/dev/vme_machdep.c12
-rw-r--r--sys/arch/sparc/dev/zs.c17
-rw-r--r--sys/arch/sparc/sparc/autoconf.c8
-rw-r--r--sys/arch/sparc/sparc/auxiotwo.c7
-rw-r--r--sys/arch/sparc/sparc/auxreg.c13
-rw-r--r--sys/arch/sparc/sparc/cpu.c12
-rw-r--r--sys/arch/sparc/sparc/cpuunit.c7
-rw-r--r--sys/arch/sparc/sparc/eeprom.c8
-rw-r--r--sys/arch/sparc/sparc/iommu.c7
-rw-r--r--sys/arch/sparc/sparc/memecc.c7
-rw-r--r--sys/arch/sparc/sparc/memreg.c12
-rw-r--r--sys/arch/sparc/sparc/mkclock.c13
-rw-r--r--sys/arch/sparc/sparc/msiiep.c15
-rw-r--r--sys/arch/sparc/sparc/oclock.c8
-rw-r--r--sys/arch/sparc/sparc/timer.c7
-rw-r--r--sys/arch/sparc/sparc/timer_msiiep.c7
-rw-r--r--sys/arch/sparc/sparc/timer_sun4.c7
40 files changed, 153 insertions, 216 deletions
diff --git a/sys/arch/sparc/dev/audioamd.c b/sys/arch/sparc/dev/audioamd.c
index ce709796157..fd38c02fc4c 100644
--- a/sys/arch/sparc/dev/audioamd.c
+++ b/sys/arch/sparc/dev/audioamd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audioamd.c,v 1.10 2002/09/27 20:35:38 thorpej Exp $ */
+/* $NetBSD: audioamd.c,v 1.11 2002/10/01 18:57:50 thorpej Exp $ */
/* NetBSD: am7930_sparc.c,v 1.44 1999/03/14 22:29:00 jonathan Exp */
/*
@@ -111,17 +111,11 @@ void audioamd_sbus_attach __P((struct device *, struct device *, void *));
int audioamd_sbus_match __P((struct device *, struct cfdata *, void *));
void audioamd_attach(struct audioamd_softc *sc, int);
-const struct cfattach audioamd_mainbus_ca = {
- sizeof(struct audioamd_softc),
- audioamd_mainbus_match,
- audioamd_mainbus_attach
-};
+CFATTACH_DECL(audioamd_mainbus, sizeof(struct audioamd_softc),
+ audioamd_mainbus_match, audioamd_mainbus_attach, NULL, NULL)
-const struct cfattach audioamd_sbus_ca = {
- sizeof(struct audioamd_softc),
- audioamd_sbus_match,
- audioamd_sbus_attach
-};
+CFATTACH_DECL(audioamd_sbus, sizeof(struct audioamd_softc),
+ audioamd_sbus_match, audioamd_sbus_attach, NULL, NULL)
/*
* Define our interface into the am7930 MI driver.
diff --git a/sys/arch/sparc/dev/bootbus.c b/sys/arch/sparc/dev/bootbus.c
index 82481bd5475..cd0afa07b0b 100644
--- a/sys/arch/sparc/dev/bootbus.c
+++ b/sys/arch/sparc/dev/bootbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bootbus.c,v 1.6 2002/09/27 20:35:39 thorpej Exp $ */
+/* $NetBSD: bootbus.c,v 1.7 2002/10/01 18:57:50 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,9 +64,8 @@ struct bootbus_softc {
static int bootbus_match(struct device *, struct cfdata *, void *);
static void bootbus_attach(struct device *, struct device *, void *);
-const struct cfattach bootbus_ca = {
- sizeof(struct bootbus_softc), bootbus_match, bootbus_attach,
-};
+CFATTACH_DECL(bootbus, sizeof(struct bootbus_softc),
+ bootbus_match, bootbus_attach, NULL, NULL)
static int bootbus_submatch(struct device *, struct cfdata *, void *);
static int bootbus_print(void *, const char *);
diff --git a/sys/arch/sparc/dev/bwtwo_obio.c b/sys/arch/sparc/dev/bwtwo_obio.c
index f583ba67ccd..581fbeba0b7 100644
--- a/sys/arch/sparc/dev/bwtwo_obio.c
+++ b/sys/arch/sparc/dev/bwtwo_obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo_obio.c,v 1.7 2002/09/27 20:35:40 thorpej Exp $ */
+/* $NetBSD: bwtwo_obio.c,v 1.8 2002/10/01 18:57:50 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -115,9 +115,8 @@ static void bwtwoattach_obio (struct device *, struct device *, void *);
static int bwtwomatch_obio (struct device *, struct cfdata *, void *);
-const struct cfattach bwtwo_obio_ca = {
- sizeof(struct bwtwo_softc), bwtwomatch_obio, bwtwoattach_obio
-};
+CFATTACH_DECL(bwtwo_obio, sizeof(struct bwtwo_softc),
+ bwtwomatch_obio, bwtwoattach_obio, NULL, NULL)
static int bwtwo_get_video_sun4(struct bwtwo_softc *);
static void bwtwo_set_video_sun4(struct bwtwo_softc *, int);
diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c
index c325aa603ef..14dc99c836f 100644
--- a/sys/arch/sparc/dev/cgeight.c
+++ b/sys/arch/sparc/dev/cgeight.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgeight.c,v 1.28 2002/09/27 20:35:40 thorpej Exp $ */
+/* $NetBSD: cgeight.c,v 1.29 2002/10/01 18:57:50 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -129,9 +129,8 @@ static void cgeightunblank __P((struct device *));
static int cg8_pfour_probe __P((void *, void *));
-const struct cfattach cgeight_ca = {
- sizeof(struct cgeight_softc), cgeightmatch, cgeightattach
-};
+CFATTACH_DECL(cgeight, sizeof(struct cgeight_softc),
+ cgeightmatch, cgeightattach, NULL, NULL)
extern struct cfdriver cgeight_cd;
diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c
index 749c891fd63..32c00079ba7 100644
--- a/sys/arch/sparc/dev/cgfour.c
+++ b/sys/arch/sparc/dev/cgfour.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfour.c,v 1.28 2002/09/27 20:35:41 thorpej Exp $ */
+/* $NetBSD: cgfour.c,v 1.29 2002/10/01 18:57:51 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -133,9 +133,8 @@ static void cgfourunblank __P((struct device *));
static int cg4_pfour_probe __P((void *, void *));
-const struct cfattach cgfour_ca = {
- sizeof(struct cgfour_softc), cgfourmatch, cgfourattach
-};
+CFATTACH_DECL(cgfour, sizeof(struct cgfour_softc),
+ cgfourmatch, cgfourattach, NULL, NULL)
extern struct cfdriver cgfour_cd;
diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c
index 5bd60b59322..d3b0142fe09 100644
--- a/sys/arch/sparc/dev/cgfourteen.c
+++ b/sys/arch/sparc/dev/cgfourteen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfourteen.c,v 1.28 2002/09/27 20:35:42 thorpej Exp $ */
+/* $NetBSD: cgfourteen.c,v 1.29 2002/10/01 18:57:51 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -105,9 +105,8 @@ static void cgfourteenattach(struct device *, struct device *, void *);
static int cgfourteenmatch(struct device *, struct cfdata *, void *);
static void cgfourteenunblank(struct device *);
-const struct cfattach cgfourteen_ca = {
- sizeof(struct cgfourteen_softc), cgfourteenmatch, cgfourteenattach
-};
+CFATTACH_DECL(cgfourteen, sizeof(struct cgfourteen_softc),
+ cgfourteenmatch, cgfourteenattach, NULL, NULL)
extern struct cfdriver cgfourteen_cd;
diff --git a/sys/arch/sparc/dev/cgsix_obio.c b/sys/arch/sparc/dev/cgsix_obio.c
index 490a65c5df1..4b0fd0efacc 100644
--- a/sys/arch/sparc/dev/cgsix_obio.c
+++ b/sys/arch/sparc/dev/cgsix_obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix_obio.c,v 1.11 2002/09/27 20:35:42 thorpej Exp $ */
+/* $NetBSD: cgsix_obio.c,v 1.12 2002/10/01 18:57:51 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -72,9 +72,8 @@ static int cgsixmatch __P((struct device *, struct cfdata *, void *));
static void cgsixattach __P((struct device *, struct device *, void *));
static int cg6_pfour_probe __P((void *, void *));
-const struct cfattach cgsix_obio_ca = {
- sizeof(struct cgsix_softc), cgsixmatch, cgsixattach
-};
+CFATTACH_DECL(cgsix_obio, sizeof(struct cgsix_softc),
+ cgsixmatch, cgsixattach, NULL, NULL)
/*
* Match a cgsix.
diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c
index fa4f126606a..f1b848e67e1 100644
--- a/sys/arch/sparc/dev/cgtwo.c
+++ b/sys/arch/sparc/dev/cgtwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgtwo.c,v 1.38 2002/09/27 20:35:43 thorpej Exp $ */
+/* $NetBSD: cgtwo.c,v 1.39 2002/10/01 18:57:51 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -94,9 +94,8 @@ static void cgtwounblank __P((struct device *));
int cgtwogetcmap __P((struct cgtwo_softc *, struct fbcmap *));
int cgtwoputcmap __P((struct cgtwo_softc *, struct fbcmap *));
-const struct cfattach cgtwo_ca = {
- sizeof(struct cgtwo_softc), cgtwomatch, cgtwoattach
-};
+CFATTACH_DECL(cgtwo, sizeof(struct cgtwo_softc),
+ cgtwomatch, cgtwoattach, NULL, NULL)
extern struct cfdriver cgtwo_cd;
diff --git a/sys/arch/sparc/dev/com_ebus.c b/sys/arch/sparc/dev/com_ebus.c
index ecbbf4009f5..0bfe825702e 100644
--- a/sys/arch/sparc/dev/com_ebus.c
+++ b/sys/arch/sparc/dev/com_ebus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_ebus.c,v 1.5 2002/09/27 20:35:44 thorpej Exp $ */
+/* $NetBSD: com_ebus.c,v 1.6 2002/10/01 18:57:51 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -63,9 +63,8 @@ struct com_ebus_softc {
static int com_ebus_match(struct device *, struct cfdata *, void *);
static void com_ebus_attach(struct device *, struct device *, void *);
-const struct cfattach com_ebus_ca = {
- sizeof(struct com_ebus_softc), com_ebus_match, com_ebus_attach
-};
+CFATTACH_DECL(com_ebus, sizeof(struct com_ebus_softc),
+ com_ebus_match, com_ebus_attach, NULL, NULL)
static int
com_ebus_match(parent, cf, aux)
diff --git a/sys/arch/sparc/dev/com_obio.c b/sys/arch/sparc/dev/com_obio.c
index 59e984e678a..4a7a21210ea 100644
--- a/sys/arch/sparc/dev/com_obio.c
+++ b/sys/arch/sparc/dev/com_obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_obio.c,v 1.10 2002/09/27 20:35:45 thorpej Exp $ */
+/* $NetBSD: com_obio.c,v 1.11 2002/10/01 18:57:51 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -108,9 +108,8 @@ static int com_obio_match __P((struct device *, struct cfdata *, void *));
static void com_obio_attach __P((struct device *, struct device *, void *));
static void com_obio_cleanup __P((void *));
-const struct cfattach com_obio_ca = {
- sizeof(struct com_obio_softc), com_obio_match, com_obio_attach
-};
+CFATTACH_DECL(com_obio, sizeof(struct com_obio_softc),
+ com_obio_match, com_obio_attach, NULL, NULL)
static int
com_obio_match(parent, cf, aux)
diff --git a/sys/arch/sparc/dev/dma_obio.c b/sys/arch/sparc/dev/dma_obio.c
index 04b5da14ec3..8827930d5bf 100644
--- a/sys/arch/sparc/dev/dma_obio.c
+++ b/sys/arch/sparc/dev/dma_obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dma_obio.c,v 1.5 2002/09/27 20:35:45 thorpej Exp $ */
+/* $NetBSD: dma_obio.c,v 1.6 2002/10/01 18:57:51 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -56,9 +56,8 @@
int dmamatch_obio __P((struct device *, struct cfdata *, void *));
void dmaattach_obio __P((struct device *, struct device *, void *));
-const struct cfattach dma_obio_ca = {
- sizeof(struct lsi64854_softc), dmamatch_obio, dmaattach_obio
-};
+CFATTACH_DECL(dma_obio, sizeof(struct lsi64854_softc),
+ dmamatch_obio, dmaattach_obio, NULL, NULL)
int
dmamatch_obio(parent, cf, aux)
diff --git a/sys/arch/sparc/dev/ebus.c b/sys/arch/sparc/dev/ebus.c
index 7b460860e46..d2f6ec4da24 100644
--- a/sys/arch/sparc/dev/ebus.c
+++ b/sys/arch/sparc/dev/ebus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.7 2002/09/27 20:35:46 thorpej Exp $ */
+/* $NetBSD: ebus.c,v 1.8 2002/10/01 18:57:51 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -96,10 +96,8 @@ struct ebus_softc {
int ebus_match(struct device *, struct cfdata *, void *);
void ebus_attach(struct device *, struct device *, void *);
-const struct cfattach ebus_ca = {
- sizeof(struct ebus_softc), ebus_match, ebus_attach
-};
-
+CFATTACH_DECL(ebus, sizeof(struct ebus_softc),
+ ebus_match, ebus_attach, NULL, NULL)
int ebus_setup_attach_args(struct ebus_softc *, int,
struct ebus_attach_args *);
diff --git a/sys/arch/sparc/dev/esp_obio.c b/sys/arch/sparc/dev/esp_obio.c
index 4ef7d934f6d..4ee59901cfb 100644
--- a/sys/arch/sparc/dev/esp_obio.c
+++ b/sys/arch/sparc/dev/esp_obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_obio.c,v 1.12 2002/09/27 20:35:46 thorpej Exp $ */
+/* $NetBSD: esp_obio.c,v 1.13 2002/10/01 18:57:51 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -75,9 +75,8 @@ void espattach_obio __P((struct device *, struct device *, void *));
int espmatch_obio __P((struct device *, struct cfdata *, void *));
/* Linkup to the rest of the kernel */
-const struct cfattach esp_obio_ca = {
- sizeof(struct esp_softc), espmatch_obio, espattach_obio
-};
+CFATTACH_DECL(esp_obio, sizeof(struct esp_softc),
+ espmatch_obio, espattach_obio, NULL, NULL)
/*
* Functions and the switch for the MI code.
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index c290357f554..0a4321c9d2c 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.92 2002/09/27 20:35:47 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.93 2002/10/01 18:57:51 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -186,12 +186,11 @@ void fdcattach_obio __P((struct device *, struct device *, void *));
int fdcattach __P((struct fdc_softc *, int));
-const struct cfattach fdc_mainbus_ca = {
- sizeof(struct fdc_softc), fdcmatch_mainbus, fdcattach_mainbus
-};
-const struct cfattach fdc_obio_ca = {
- sizeof(struct fdc_softc), fdcmatch_obio, fdcattach_obio
-};
+CFATTACH_DECL(fdc_mainbus, sizeof(struct fdc_softc),
+ fdcmatch_mainbus, fdcattach_mainbus, NULL, NULL)
+
+CFATTACH_DECL(fdc_obio, sizeof(struct fdc_softc),
+ fdcmatch_obio, fdcattach_obio, NULL, NULL)
__inline struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t));
@@ -262,9 +261,8 @@ struct fd_softc {
int fdmatch __P((struct device *, struct cfdata *, void *));
void fdattach __P((struct device *, struct device *, void *));
-const struct cfattach fd_ca = {
- sizeof(struct fd_softc), fdmatch, fdattach
-};
+CFATTACH_DECL(fd, sizeof(struct fd_softc),
+ fdmatch, fdattach, NULL, NULL)
extern struct cfdriver fd_cd;
diff --git a/sys/arch/sparc/dev/if_ie_obio.c b/sys/arch/sparc/dev/if_ie_obio.c
index 232b017e574..956ec612cec 100644
--- a/sys/arch/sparc/dev/if_ie_obio.c
+++ b/sys/arch/sparc/dev/if_ie_obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_obio.c,v 1.25 2002/09/27 20:35:49 thorpej Exp $ */
+/* $NetBSD: if_ie_obio.c,v 1.26 2002/10/01 18:57:52 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -132,9 +132,8 @@ static void ie_obrun __P((struct ie_softc *));
int ie_obio_match __P((struct device *, struct cfdata *, void *));
void ie_obio_attach __P((struct device *, struct device *, void *));
-const struct cfattach ie_obio_ca = {
- sizeof(struct ie_softc), ie_obio_match, ie_obio_attach
-};
+CFATTACH_DECL(ie_obio, sizeof(struct ie_softc),
+ ie_obio_match, ie_obio_attach, NULL, NULL)
/* Supported media */
static int media[] = {
diff --git a/sys/arch/sparc/dev/if_le_obio.c b/sys/arch/sparc/dev/if_le_obio.c
index e4183508c61..19a42d6c5a6 100644
--- a/sys/arch/sparc/dev/if_le_obio.c
+++ b/sys/arch/sparc/dev/if_le_obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_obio.c,v 1.14 2002/09/27 20:35:50 thorpej Exp $ */
+/* $NetBSD: if_le_obio.c,v 1.15 2002/10/01 18:57:52 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -86,9 +86,8 @@ static int lemedia[] = {
};
#define NLEMEDIA (sizeof(lemedia) / sizeof(lemedia[0]))
-const struct cfattach le_obio_ca = {
- sizeof(struct le_softc), lematch_obio, leattach_obio
-};
+CFATTACH_DECL(le_obio, sizeof(struct le_softc),
+ lematch_obio, leattach_obio, NULL, NULL)
extern struct cfdriver le_cd;
diff --git a/sys/arch/sparc/dev/obio.c b/sys/arch/sparc/dev/obio.c
index d694fe15c18..be33e14d016 100644
--- a/sys/arch/sparc/dev/obio.c
+++ b/sys/arch/sparc/dev/obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.56 2002/09/27 20:35:50 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.57 2002/10/01 18:57:52 thorpej Exp $ */
/*-
* Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@@ -76,10 +76,8 @@ union obio_softc {
static int obiomatch __P((struct device *, struct cfdata *, void *));
static void obioattach __P((struct device *, struct device *, void *));
-const struct cfattach obio_ca = {
- sizeof(union obio_softc), obiomatch, obioattach
-};
-
+CFATTACH_DECL(obio, sizeof(union obio_softc),
+ obiomatch, obioattach, NULL, NULL)
/*
* This `obio4_busattachargs' data structure only exists to pass down
diff --git a/sys/arch/sparc/dev/pckbc_js.c b/sys/arch/sparc/dev/pckbc_js.c
index 3fa0f500e7f..f91e3a538c8 100644
--- a/sys/arch/sparc/dev/pckbc_js.c
+++ b/sys/arch/sparc/dev/pckbc_js.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_js.c,v 1.3 2002/09/27 20:35:51 thorpej Exp $ */
+/* $NetBSD: pckbc_js.c,v 1.4 2002/10/01 18:57:52 thorpej Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -65,15 +65,12 @@ static void pckbc_js_attach_common( struct pckbc_js_softc *,
static void pckbc_js_intr_establish(struct pckbc_softc *, pckbc_slot_t);
/* Mr.Coffee */
-const struct cfattach pckbc_obio_ca = {
- sizeof(struct pckbc_js_softc), pckbc_obio_match, pckbc_obio_attach
-};
+CFATTACH_DECL(pckbc_obio, sizeof(struct pckbc_js_softc),
+ pckbc_obio_match, pckbc_obio_attach, NULL, NULL)
/* ms-IIep */
-const struct cfattach pckbc_ebus_ca = {
- sizeof(struct pckbc_js_softc), pckbc_ebus_match, pckbc_ebus_attach
-};
-
+CFATTACH_DECL(pckbc_ebus, sizeof(struct pckbc_js_softc),
+ pckbc_ebus_match, pckbc_ebus_attach, NULL, NULL)
#define PCKBC_PROM_DEVICE_NAME "8042"
diff --git a/sys/arch/sparc/dev/power.c b/sys/arch/sparc/dev/power.c
index b4395bc5f71..23fbdd156f3 100644
--- a/sys/arch/sparc/dev/power.c
+++ b/sys/arch/sparc/dev/power.c
@@ -1,4 +1,4 @@
-/* $NetBSD: power.c,v 1.13 2002/09/27 20:35:51 thorpej Exp $ */
+/* $NetBSD: power.c,v 1.14 2002/10/01 18:57:52 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -51,9 +51,8 @@
static int powermatch __P((struct device *, struct cfdata *, void *));
static void powerattach __P((struct device *, struct device *, void *));
-const struct cfattach power_ca = {
- sizeof(struct device), powermatch, powerattach
-};
+CFATTACH_DECL(power, sizeof(struct device),
+ powermatch, powerattach, NULL, NULL)
/*
* This is the driver for the "power" register available on some Sun4m
diff --git a/sys/arch/sparc/dev/rtc.c b/sys/arch/sparc/dev/rtc.c
index 7ebb879cca1..97de0ed5505 100644
--- a/sys/arch/sparc/dev/rtc.c
+++ b/sys/arch/sparc/dev/rtc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.6 2002/09/27 20:35:52 thorpej Exp $ */
+/* $NetBSD: rtc.c,v 1.7 2002/10/01 18:57:52 thorpej Exp $ */
/*
* Copyright (c) 2001 Valeriy E. Ushakov
@@ -61,10 +61,8 @@ struct rtc_ebus_softc {
static int rtcmatch_ebus(struct device *, struct cfdata *, void *);
static void rtcattach_ebus(struct device *, struct device *, void *);
-const struct cfattach rtc_ebus_ca = {
- sizeof(struct rtc_ebus_softc), rtcmatch_ebus, rtcattach_ebus
-};
-
+CFATTACH_DECL(rtc_ebus, sizeof(struct rtc_ebus_softc),
+ rtcmatch_ebus, rtcattach_ebus, NULL, NULL)
/* XXX: global TOD clock handle (sparc/clock.c) */
extern todr_chip_handle_t todr_handle;
diff --git a/sys/arch/sparc/dev/sbus.c b/sys/arch/sparc/dev/sbus.c
index 3e9a651e029..7dd79e29cca 100644
--- a/sys/arch/sparc/dev/sbus.c
+++ b/sys/arch/sparc/dev/sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.50 2002/09/27 20:35:52 thorpej Exp $ */
+/* $NetBSD: sbus.c,v 1.51 2002/10/01 18:57:52 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -125,15 +125,14 @@ void sbus_attach_xbox __P((struct device *, struct device *, void *));
static int sbus_error __P((void));
int (*sbuserr_handler) __P((void));
-const struct cfattach sbus_mainbus_ca = {
- sizeof(struct sbus_softc), sbus_match_mainbus, sbus_attach_mainbus
-};
-const struct cfattach sbus_iommu_ca = {
- sizeof(struct sbus_softc), sbus_match_iommu, sbus_attach_iommu
-};
-const struct cfattach sbus_xbox_ca = {
- sizeof(struct sbus_softc), sbus_match_xbox, sbus_attach_xbox
-};
+CFATTACH_DECL(sbus_mainbus, sizeof(struct sbus_softc),
+ sbus_match_mainbus, sbus_attach_mainbus, NULL, NULL)
+
+CFATTACH_DECL(sbus_iommu, sizeof(struct sbus_softc),
+ sbus_match_iommu, sbus_attach_iommu, NULL, NULL)
+
+CFATTACH_DECL(sbus_xbox, sizeof(struct sbus_softc),
+ sbus_match_xbox, sbus_attach_xbox, NULL, NULL)
extern struct cfdriver sbus_cd;
diff --git a/sys/arch/sparc/dev/sw.c b/sys/arch/sparc/dev/sw.c
index 5a7141a1f8f..151f6adf44d 100644
--- a/sys/arch/sparc/dev/sw.c
+++ b/sys/arch/sparc/dev/sw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sw.c,v 1.8 2002/09/27 20:35:53 thorpej Exp $ */
+/* $NetBSD: sw.c,v 1.9 2002/10/01 18:57:52 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -219,9 +219,8 @@ void sw_intr_off __P((struct ncr5380_softc *));
/* The Sun "SCSI Weird" 4/100 obio controller. */
-const struct cfattach sw_ca = {
- sizeof(struct sw_softc), sw_match, sw_attach
-};
+CFATTACH_DECL(sw, sizeof(struct sw_softc),
+ sw_match, sw_attach, NULL, NULL)
static int
sw_match(parent, cf, aux)
diff --git a/sys/arch/sparc/dev/tctrl.c b/sys/arch/sparc/dev/tctrl.c
index 4ab3339cb95..7da80f26f81 100644
--- a/sys/arch/sparc/dev/tctrl.c
+++ b/sys/arch/sparc/dev/tctrl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tctrl.c,v 1.16 2002/09/27 20:35:53 thorpej Exp $ */
+/* $NetBSD: tctrl.c,v 1.17 2002/10/01 18:57:53 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -148,9 +148,8 @@ static int tctrl_apm_record_event __P((struct tctrl_softc *sc,
u_int event_type));
static void tctrl_init_lcd __P((void));
-const struct cfattach tctrl_ca = {
- sizeof(struct tctrl_softc), tctrl_match, tctrl_attach
-};
+CFATTACH_DECL(tctrl, sizeof(struct tctrl_softc),
+ tctrl_match, tctrl_attach, NULL, NULL)
extern struct cfdriver tctrl_cd;
/* XXX wtf is this? see i386/apm.c */
diff --git a/sys/arch/sparc/dev/vme_machdep.c b/sys/arch/sparc/dev/vme_machdep.c
index 54b898a8fff..f7016ebb808 100644
--- a/sys/arch/sparc/dev/vme_machdep.c
+++ b/sys/arch/sparc/dev/vme_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_machdep.c,v 1.37 2002/09/27 20:35:54 thorpej Exp $ */
+/* $NetBSD: vme_machdep.c,v 1.38 2002/10/01 18:57:53 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -157,13 +157,11 @@ static paddr_t sparc_vme_dmamem_mmap __P((bus_dma_tag_t,
int sparc_vme_mmap_cookie __P((vme_addr_t, vme_am_t, bus_space_handle_t *));
-const struct cfattach vme_mainbus_ca = {
- sizeof(struct sparcvme_softc), vmematch_mainbus, vmeattach_mainbus
-};
+CFATTACH_DECL(vme_mainbus, sizeof(struct sparcvme_softc),
+ vmematch_mainbus, vmeattach_mainbus, NULL, NULL)
-const struct cfattach vme_iommu_ca = {
- sizeof(struct sparcvme_softc), vmematch_iommu, vmeattach_iommu
-};
+CFATTACH_DECL(vme_iommu, sizeof(struct sparcvme_softc),
+ vmematch_iommu, vmeattach_iommu, NULL, NULL)
int (*vmeerr_handler) __P((void));
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c
index 9f190a9a1ae..e658ad180d4 100644
--- a/sys/arch/sparc/dev/zs.c
+++ b/sys/arch/sparc/dev/zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.89 2002/09/27 20:35:55 thorpej Exp $ */
+/* $NetBSD: zs.c,v 1.90 2002/10/01 18:57:53 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -177,21 +177,18 @@ static void zs_attach_obio __P((struct device *, struct device *, void *));
static int zs_match_bootbus __P((struct device *, struct cfdata *, void *));
static void zs_attach_bootbus __P((struct device *, struct device *, void *));
-const struct cfattach zs_bootbus_ca = {
- sizeof(struct zsc_softc), zs_match_bootbus, zs_attach_bootbus
-};
+CFATTACH_DECL(zs_bootbus, sizeof(struct zsc_softc),
+ zs_match_bootbus, zs_attach_bootbus, NULL, NULL)
#endif /* SUN4D */
static void zs_attach __P((struct zsc_softc *, struct zsdevice *, int));
static int zs_print __P((void *, const char *name));
-const struct cfattach zs_mainbus_ca = {
- sizeof(struct zsc_softc), zs_match_mainbus, zs_attach_mainbus
-};
+CFATTACH_DECL(zs_mainbus, sizeof(struct zsc_softc),
+ zs_match_mainbus, zs_attach_mainbus, NULL, NULL)
-const struct cfattach zs_obio_ca = {
- sizeof(struct zsc_softc), zs_match_obio, zs_attach_obio
-};
+CFATTACH_DECL(zs_obio, sizeof(struct zsc_softc),
+ zs_match_obio, zs_attach_obio, NULL, NULL)
extern struct cfdriver zs_cd;
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index 6d52fdf3f42..dbee1ea0794 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.179 2002/09/27 20:35:57 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.180 2002/10/01 18:57:48 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -1336,10 +1336,8 @@ extern struct sparc_bus_space_tag mainbus_space_tag;
#endif /* SUN4C || SUN4M */
}
-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
makememarr(ap, max, which)
diff --git a/sys/arch/sparc/sparc/auxiotwo.c b/sys/arch/sparc/sparc/auxiotwo.c
index cda79116add..4bb492e9494 100644
--- a/sys/arch/sparc/sparc/auxiotwo.c
+++ b/sys/arch/sparc/sparc/auxiotwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auxiotwo.c,v 1.4 2002/09/27 20:35:58 thorpej Exp $ */
+/* $NetBSD: auxiotwo.c,v 1.5 2002/10/01 18:57:48 thorpej Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -60,9 +60,8 @@ static int auxiotwomatch __P((struct device *, struct cfdata *, void *));
static void auxiotwoattach
__P((struct device *, struct device *, void *));
-const struct cfattach auxiotwo_obio_ca = {
- sizeof(struct device), auxiotwomatch, auxiotwoattach
-};
+CFATTACH_DECL(auxiotwo_obio, sizeof(struct device),
+ auxiotwomatch, auxiotwoattach, NULL, NULL)
/*
* The OPENPROM calls this "auxio2".
diff --git a/sys/arch/sparc/sparc/auxreg.c b/sys/arch/sparc/sparc/auxreg.c
index 637130f5f6d..7b4a9918f7a 100644
--- a/sys/arch/sparc/sparc/auxreg.c
+++ b/sys/arch/sparc/sparc/auxreg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auxreg.c,v 1.30 2002/09/27 20:35:59 thorpej Exp $ */
+/* $NetBSD: auxreg.c,v 1.31 2002/10/01 18:57:48 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -66,12 +66,11 @@ static void auxregattach_obio
static void auxregattach __P((struct device *));
-const struct cfattach auxreg_mainbus_ca = {
- sizeof(struct device), auxregmatch_mainbus, auxregattach_mainbus
-};
-const struct cfattach auxreg_obio_ca = {
- sizeof(struct device), auxregmatch_obio, auxregattach_obio
-};
+CFATTACH_DECL(auxreg_mainbus, sizeof(struct device),
+ auxregmatch_mainbus, auxregattach_mainbus, NULL, NULL)
+
+CFATTACH_DECL(auxreg_obio, sizeof(struct device),
+ auxregmatch_obio, auxregattach_obio, NULL, NULL)
#ifdef BLINK
static struct callout blink_ch = CALLOUT_INITIALIZER;
diff --git a/sys/arch/sparc/sparc/cpu.c b/sys/arch/sparc/sparc/cpu.c
index 98488e11bd6..79ecca19a7a 100644
--- a/sys/arch/sparc/sparc/cpu.c
+++ b/sys/arch/sparc/sparc/cpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.132 2002/09/27 20:35:59 thorpej Exp $ */
+/* $NetBSD: cpu.c,v 1.133 2002/10/01 18:57:48 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -103,17 +103,15 @@ static int cpu_instance; /* current # of CPUs wired by us */
static void cpu_mainbus_attach __P((struct device *, struct device *, void *));
int cpu_mainbus_match __P((struct device *, struct cfdata *, void *));
-const struct cfattach cpu_mainbus_ca = {
- sizeof(struct cpu_softc), cpu_mainbus_match, cpu_mainbus_attach
-};
+CFATTACH_DECL(cpu_mainbus, sizeof(struct cpu_softc),
+ cpu_mainbus_match, cpu_mainbus_attach, NULL, NULL)
#if defined(SUN4D)
static int cpu_cpuunit_match(struct device *, struct cfdata *, void *);
static void cpu_cpuunit_attach(struct device *, struct device *, void *);
-const struct cfattach cpu_cpuunit_ca = {
- sizeof(struct cpu_softc), cpu_cpuunit_match, cpu_cpuunit_attach
-};
+CFATTACH_DECL(cpu_cpuunit, sizeof(struct cpu_softc),
+ cpu_cpuunit_match, cpu_cpuunit_attach, NULL, NULL)
#endif /* SUN4D */
static void cpu_attach(struct cpu_softc *, int, int);
diff --git a/sys/arch/sparc/sparc/cpuunit.c b/sys/arch/sparc/sparc/cpuunit.c
index 614195aa091..f7e1077af9d 100644
--- a/sys/arch/sparc/sparc/cpuunit.c
+++ b/sys/arch/sparc/sparc/cpuunit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuunit.c,v 1.4 2002/09/27 20:36:00 thorpej Exp $ */
+/* $NetBSD: cpuunit.c,v 1.5 2002/10/01 18:57:49 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,9 +64,8 @@ struct cpuunit_softc {
static int cpuunit_match(struct device *, struct cfdata *, void *);
static void cpuunit_attach(struct device *, struct device *, void *);
-const struct cfattach cpuunit_ca = {
- sizeof(struct cpuunit_softc), cpuunit_match, cpuunit_attach,
-};
+CFATTACH_DECL(cpuunit, sizeof(struct cpuunit_softc),
+ cpuunit_match, cpuunit_attach, NULL, NULL)
static int cpuunit_print(void *, const char *);
diff --git a/sys/arch/sparc/sparc/eeprom.c b/sys/arch/sparc/sparc/eeprom.c
index 23cac623817..b58ebb90713 100644
--- a/sys/arch/sparc/sparc/eeprom.c
+++ b/sys/arch/sparc/sparc/eeprom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eeprom.c,v 1.2 2002/09/27 20:36:01 thorpej Exp $ */
+/* $NetBSD: eeprom.c,v 1.3 2002/10/01 18:57:49 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,10 +64,8 @@ extern char *eeprom_va;
static int eeprom_match(struct device *, struct cfdata *, void *);
static void eeprom_attach(struct device *, struct device *, void *);
-const struct cfattach eeprom_ca = {
- sizeof(struct device), eeprom_match, eeprom_attach
-};
-
+CFATTACH_DECL(eeprom, sizeof(struct device),
+ eeprom_match, eeprom_attach, NULL, NULL)
/* We support only one eeprom device */
static int eeprom_attached;
diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c
index 475514547e5..4d6656c5fdf 100644
--- a/sys/arch/sparc/sparc/iommu.c
+++ b/sys/arch/sparc/sparc/iommu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.70 2002/09/27 20:36:01 thorpej Exp $ */
+/* $NetBSD: iommu.c,v 1.71 2002/10/01 18:57:49 thorpej Exp $ */
/*
* Copyright (c) 1996
@@ -84,9 +84,8 @@ int iommu_match __P((struct device *, struct cfdata *, void *));
static void iommu_copy_prom_entries __P((struct iommu_softc *));
#endif
-const struct cfattach iommu_ca = {
- sizeof(struct iommu_softc), iommu_match, iommu_attach
-};
+CFATTACH_DECL(iommu, sizeof(struct iommu_softc),
+ iommu_match, iommu_attach, NULL, NULL)
/* IOMMU DMA map functions */
int iommu_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
diff --git a/sys/arch/sparc/sparc/memecc.c b/sys/arch/sparc/sparc/memecc.c
index 50eae14af45..25d7fa405c3 100644
--- a/sys/arch/sparc/sparc/memecc.c
+++ b/sys/arch/sparc/sparc/memecc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memecc.c,v 1.4 2002/09/27 20:36:02 thorpej Exp $ */
+/* $NetBSD: memecc.c,v 1.5 2002/10/01 18:57:49 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -63,9 +63,8 @@ static int memecc_error __P((void));
int (*memerr_handler) __P((void));
-const struct cfattach eccmemctl_ca = {
- sizeof(struct memecc_softc), memecc_match, memecc_attach
-};
+CFATTACH_DECL(eccmemctl, sizeof(struct memecc_softc),
+ memecc_match, memecc_attach, NULL, NULL)
int
memecc_match(parent, cf, aux)
diff --git a/sys/arch/sparc/sparc/memreg.c b/sys/arch/sparc/sparc/memreg.c
index a03c12b2c33..c4432d73b90 100644
--- a/sys/arch/sparc/sparc/memreg.c
+++ b/sys/arch/sparc/sparc/memreg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memreg.c,v 1.33 2002/09/27 20:36:03 thorpej Exp $ */
+/* $NetBSD: memreg.c,v 1.34 2002/10/01 18:57:49 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -72,13 +72,11 @@ static void memregattach_mainbus
static void memregattach_obio
__P((struct device *, struct device *, void *));
-const struct cfattach memreg_mainbus_ca = {
- sizeof(struct device), memregmatch_mainbus, memregattach_mainbus
-};
+CFATTACH_DECL(memreg_mainbus, sizeof(struct device),
+ memregmatch_mainbus, memregattach_mainbus, NULL, NULL)
-const struct cfattach memreg_obio_ca = {
- sizeof(struct device), memregmatch_obio, memregattach_obio
-};
+CFATTACH_DECL(memreg_obio, sizeof(struct device),
+ memregmatch_obio, memregattach_obio, NULL, NULL)
#if defined(SUN4M)
static void hardmemerr4m __P((unsigned, u_int, u_int, u_int, u_int));
diff --git a/sys/arch/sparc/sparc/mkclock.c b/sys/arch/sparc/sparc/mkclock.c
index 980d56389e6..237a869622c 100644
--- a/sys/arch/sparc/sparc/mkclock.c
+++ b/sys/arch/sparc/sparc/mkclock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkclock.c,v 1.2 2002/09/27 20:36:03 thorpej Exp $ */
+/* $NetBSD: mkclock.c,v 1.3 2002/10/01 18:57:49 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -71,14 +71,11 @@ static void clockattach_obio(struct device *, struct device *, void *);
static void clockattach(int, bus_space_tag_t, bus_space_handle_t);
-const struct cfattach clock_mainbus_ca = {
- sizeof(struct device), clockmatch_mainbus, clockattach_mainbus
-};
-
-const struct cfattach clock_obio_ca = {
- sizeof(struct device), clockmatch_obio, clockattach_obio
-};
+CFATTACH_DECL(clock_mainbus, sizeof(struct device),
+ clockmatch_mainbus, clockattach_mainbus, NULL, NULL)
+CFATTACH_DECL(clock_obio, sizeof(struct device),
+ clockmatch_obio, clockattach_obio, NULL, NULL)
/* Imported from clock.c: */
extern todr_chip_handle_t todr_handle;
diff --git a/sys/arch/sparc/sparc/msiiep.c b/sys/arch/sparc/sparc/msiiep.c
index 8f09ffa1fb1..f1fa95cf948 100644
--- a/sys/arch/sparc/sparc/msiiep.c
+++ b/sys/arch/sparc/sparc/msiiep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msiiep.c,v 1.12 2002/09/27 20:36:04 thorpej Exp $ */
+/* $NetBSD: msiiep.c,v 1.13 2002/10/01 18:57:49 thorpej Exp $ */
/*
* Copyright (c) 2001 Valeriy E. Ushakov
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.12 2002/09/27 20:36:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.13 2002/10/01 18:57:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -68,9 +68,8 @@ static int msiiep_match(struct device *, struct cfdata *, void *);
static void msiiep_attach(struct device *, struct device *, void *);
/* static int msiiep_print(void *, const char *); */
-const struct cfattach msiiep_ca = {
- sizeof(struct device), msiiep_match, msiiep_attach
-};
+CFATTACH_DECL(msiiep, sizeof(struct device),
+ msiiep_match, msiiep_attach, NULL, NULL)
static struct idprom msiiep_idprom_store;
static void msiiep_getidprom(void);
@@ -83,10 +82,8 @@ static int mspcic_match(struct device *, struct cfdata *, void *);
static void mspcic_attach(struct device *, struct device *, void *);
static int mspcic_print(void *, const char *);
-const struct cfattach mspcic_ca = {
- sizeof(struct mspcic_softc), mspcic_match, mspcic_attach
-};
-
+CFATTACH_DECL(mspcic, sizeof(struct mspcic_softc),
+ mspcic_match, mspcic_attach, NULL, NULL)
/**
* ms-IIep PCIC registers are mapped at fixed VA
diff --git a/sys/arch/sparc/sparc/oclock.c b/sys/arch/sparc/sparc/oclock.c
index 802a9313d31..a1afc5d1305 100644
--- a/sys/arch/sparc/sparc/oclock.c
+++ b/sys/arch/sparc/sparc/oclock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oclock.c,v 1.2 2002/09/27 20:36:04 thorpej Exp $ */
+/* $NetBSD: oclock.c,v 1.3 2002/10/01 18:57:49 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -67,10 +67,8 @@ void establish_hostid(struct idprom *);
static int oclockmatch(struct device *, struct cfdata *, void *);
static void oclockattach(struct device *, struct device *, void *);
-const struct cfattach oclock_ca = {
- sizeof(struct device), oclockmatch, oclockattach
-};
-
+CFATTACH_DECL(oclock, sizeof(struct device),
+ oclockmatch, oclockattach, NULL, NULL)
#if defined(SUN4)
static bus_space_tag_t i7_bt;
diff --git a/sys/arch/sparc/sparc/timer.c b/sys/arch/sparc/sparc/timer.c
index a6212f37eb6..0dffdecb199 100644
--- a/sys/arch/sparc/sparc/timer.c
+++ b/sys/arch/sparc/sparc/timer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.c,v 1.8 2002/09/27 20:36:05 thorpej Exp $ */
+/* $NetBSD: timer.c,v 1.9 2002/10/01 18:57:49 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -190,7 +190,6 @@ timerattach_obio(struct device *parent, struct device *self, void *aux)
#endif /* SUN4 */
}
-const struct cfattach timer_obio_ca = {
- sizeof(struct device), timermatch_obio, timerattach_obio
-};
+CFATTACH_DECL(timer_obio, sizeof(struct device),
+ timermatch_obio, timerattach_obio, NULL, NULL)
#endif /* SUN4 || SUN4M */
diff --git a/sys/arch/sparc/sparc/timer_msiiep.c b/sys/arch/sparc/sparc/timer_msiiep.c
index 5ad9ce4d58d..0bc682521a9 100644
--- a/sys/arch/sparc/sparc/timer_msiiep.c
+++ b/sys/arch/sparc/sparc/timer_msiiep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_msiiep.c,v 1.2 2002/09/27 20:36:05 thorpej Exp $ */
+/* $NetBSD: timer_msiiep.c,v 1.3 2002/10/01 18:57:50 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -219,6 +219,5 @@ timerattach_msiiep(struct device *parent, struct device *self, void *aux)
timerok = 1;
}
-const struct cfattach timer_msiiep_ca = {
- sizeof(struct device), timermatch_msiiep, timerattach_msiiep
-};
+CFATTACH_DECL(timer_msiiep, sizeof(struct device),
+ timermatch_msiiep, timerattach_msiiep, NULL, NULL)
diff --git a/sys/arch/sparc/sparc/timer_sun4.c b/sys/arch/sparc/sparc/timer_sun4.c
index ef12bbb9825..265581e5a5b 100644
--- a/sys/arch/sparc/sparc/timer_sun4.c
+++ b/sys/arch/sparc/sparc/timer_sun4.c
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_sun4.c,v 1.2 2002/09/27 20:36:06 thorpej Exp $ */
+/* $NetBSD: timer_sun4.c,v 1.3 2002/10/01 18:57:50 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -161,9 +161,8 @@ timerattach_mainbus(struct device *parent, struct device *self, void *aux)
timerattach(&timerreg4->t_c14.t_counter, &timerreg4->t_c14.t_limit);
}
-const struct cfattach timer_mainbus_ca = {
- sizeof(struct device), timermatch_mainbus, timerattach_mainbus
-};
+CFATTACH_DECL(timer_mainbus, sizeof(struct device),
+ timermatch_mainbus, timerattach_mainbus, NULL, NULL)
#endif /* SUN4C */
#if defined(SUN4)