Use CFATTACH_DECL().

sys/arch/mvmeppc/isa/mkclock_isa.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mkclock_isa.c,v 1.3 2002/09/27 20:34:04 thorpej Exp $	*/
+/*	$NetBSD: mkclock_isa.c,v 1.4 2002/10/02 04:49:10 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mkclock_isa.c,v 1.3 2002/09/27 20:34:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mkclock_isa.c,v 1.4 2002/10/02 04:49:10 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -79,10 +79,8 @@ struct mkclock_isa_softc {
 int	mkclock_isa_match(struct device *, struct cfdata *, void *);
 void	mkclock_isa_attach(struct device *, struct device *, void *);
 
-const struct cfattach mkclock_isa_ca = {
+CFATTACH_DECL(mkclock_isa, sizeof (struct mkclock_isa_softc),
-	sizeof (struct mkclock_isa_softc), mkclock_isa_match,
+    mkclock_isa_match, mkclock_isa_attach, NULL, NULL);
-	    mkclock_isa_attach, 
-};
 
 
 /* mk48txx interface */

sys/arch/mvmeppc/mvmeppc/cpu.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.2 2002/09/27 20:34:05 thorpej Exp $	*/
+/*	$NetBSD: cpu.c,v 1.3 2002/10/02 04:49:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -48,9 +48,8 @@
 int cpumatch(struct device *, struct cfdata *, void *);
 void cpuattach(struct device *, struct device *, void *);
 
-const struct cfattach cpu_ca = {
+CFATTACH_DECL(cpu, sizeof(struct device),
-	sizeof(struct device), cpumatch, cpuattach
+    cpumatch, cpuattach, NULL, NULL);
-};
 
 extern struct cfdriver cpu_cd;
 

sys/arch/mvmeppc/mvmeppc/mainbus.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.3 2002/09/27 20:34:05 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.4 2002/10/02 04:49:11 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -47,9 +47,8 @@
 int	mainbus_match(struct device *, struct cfdata *, void *);
 void	mainbus_attach(struct device *, struct device *, void *);
 
-const struct cfattach mainbus_ca = {
+CFATTACH_DECL(mainbus, sizeof(struct device),
-	sizeof(struct device), mainbus_match, mainbus_attach
+    mainbus_match, mainbus_attach, NULL, NULL);
-};
 
 int	mainbus_print(void *, const char *);
 

sys/arch/mvmeppc/pci/pchb.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: pchb.c,v 1.2 2002/09/27 20:34:06 thorpej Exp $	*/
+/*	$NetBSD: pchb.c,v 1.3 2002/10/02 04:49:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,9 +53,8 @@
 int	pchbmatch __P((struct device *, struct cfdata *, void *));
 void	pchbattach __P((struct device *, struct device *, void *));
 
-const struct cfattach pchb_ca = {
+CFATTACH_DECL(pchb, sizeof(struct device),
-	sizeof(struct device), pchbmatch, pchbattach
+    pchbmatch, pchbattach, NULL, NULL);
-};
 
 int
 pchbmatch(parent, cf, aux)

sys/arch/mvmeppc/pci/pcib.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.2 2002/09/27 20:34:06 thorpej Exp $	*/
+/*	$NetBSD: pcib.c,v 1.3 2002/10/02 04:49:11 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -61,9 +61,8 @@ struct pcib_softc {
 	struct mvmeppc_isa_chipset sc_chipset;
 };
 
-const struct cfattach pcib_ca = {
+CFATTACH_DECL(pcib, sizeof(struct pcib_softc),
-	sizeof(struct pcib_softc), pcibmatch, pcibattach
+    pcibmatch, pcibattach, NULL, NULL);
-};
 
 void	pcib_callback(struct device *);
 int	pcib_print(void *, const char *);

sys/arch/netwinder/pci/pcib.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.3 2002/09/27 20:34:07 thorpej Exp $	*/
+/*	$NetBSD: pcib.c,v 1.4 2002/10/02 04:45:25 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -56,9 +56,8 @@
 int	pcibmatch __P((struct device *, struct cfdata *, void *));
 void	pcibattach __P((struct device *, struct device *, void *));
 
-const struct cfattach pcib_ca = {
+CFATTACH_DECL(pcib, sizeof(struct device),
-	sizeof(struct device), pcibmatch, pcibattach
+    pcibmatch, pcibattach, NULL, NULL);
-};
 
 void	pcib_callback __P((struct device *));
 int	pcib_print __P((void *, const char *));

sys/arch/news68k/dev/hb.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: hb.c,v 1.8 2002/09/27 20:34:08 thorpej Exp $	*/
+/*	$NetBSD: hb.c,v 1.9 2002/10/02 04:40:08 thorpej Exp $	*/
 
 /*-
  * Copyright (C) 1999 Izumi Tsutsui.  All rights reserved.
@@ -42,9 +42,8 @@ static void	hb_attach __P((struct device *, struct device *, void *));
 static int	hb_search __P((struct device *, struct cfdata *, void *));
 static int	hb_print __P((void *, const char *));
 
-const struct cfattach hb_ca = {
+CFATTACH_DECL(hb, sizeof(struct device),
-	sizeof(struct device), hb_match, hb_attach
+    hb_match, hb_attach, NULL, NULL);
-};
 
 extern struct cfdriver hb_cd;
 

sys/arch/news68k/dev/if_le.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.4 2002/09/27 20:34:08 thorpej Exp $	*/
+/*	$NetBSD: if_le.c,v 1.5 2002/10/02 04:40:08 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -89,9 +89,8 @@ struct	le_softc {
 static int	le_match __P((struct device *, struct cfdata *, void *));
 static void	le_attach __P((struct device *, struct device *, void *));
 
-const struct cfattach le_ca = {
+CFATTACH_DECL(le, sizeof(struct le_softc),
-	sizeof(struct le_softc), le_match, le_attach
+    le_match, le_attach, NULL, NULL);
-};
 
 extern volatile u_char *lance_mem, *idrom_addr;
 

sys/arch/news68k/dev/kb_hb.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: kb_hb.c,v 1.2 2002/09/27 20:34:09 thorpej Exp $	*/
+/*	$NetBSD: kb_hb.c,v 1.3 2002/10/02 04:40:08 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001 Izumi Tsutsui.
@@ -54,9 +54,8 @@ void	kb_hb_init(struct kb_softc *);
 int	kb_hb_intr(void *);
 int	kb_hb_cnattach(void);
 
-const struct cfattach kb_hb_ca = {
+CFATTACH_DECL(kb_hb, sizeof(struct kb_softc),
-	sizeof(struct kb_softc), kb_hb_match, kb_hb_attach
+    kb_hb_match, kb_hb_attach, NULL, NULL);
-};
 
 struct console_softc kb_hb_conssc;
 

sys/arch/news68k/dev/kb_kbc.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: kb_kbc.c,v 1.2 2002/09/27 20:34:09 thorpej Exp $	*/
+/*	$NetBSD: kb_kbc.c,v 1.3 2002/10/02 04:40:08 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001 Izumi Tsutsui.
@@ -52,9 +52,8 @@ void	kb_kbc_init(struct kb_softc *);
 int	kb_kbc_intr(void *);
 int	kb_kbc_cnattach(void);
 
-const struct cfattach kb_kbc_ca = {
+CFATTACH_DECL(kb_kbc, sizeof(struct kb_softc),
-	sizeof(struct kb_softc), kb_kbc_match, kb_kbc_attach
+    kb_kbc_match, kb_kbc_attach, NULL, NULL);
-};
 
 struct console_softc kb_kbc_conssc;
 

sys/arch/news68k/dev/kbc.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: kbc.c,v 1.2 2002/09/27 20:34:10 thorpej Exp $	*/
+/*	$NetBSD: kbc.c,v 1.3 2002/10/02 04:40:08 thorpej Exp $	*/
 
 /*-
  * Copyright (C) 2001 Izumi Tsutsui.  All rights reserved.
@@ -48,9 +48,8 @@ static int kbc_match __P((struct device *, struct cfdata *, void *));
 static void kbc_attach __P((struct device *, struct device *, void *));
 static int kbc_print __P((void *, const char *name));
 
-const struct cfattach kbc_ca = {
+CFATTACH_DECL(kbc, sizeof(struct device),
-	sizeof(struct device), kbc_match, kbc_attach
+    kbc_match, kbc_attach, NULL, NULL);
-};
 
 extern struct cfdriver kbc_cd;
 

sys/arch/news68k/dev/mkclock_hb.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mkclock_hb.c,v 1.3 2002/09/27 20:34:10 thorpej Exp $	*/
+/*	$NetBSD: mkclock_hb.c,v 1.4 2002/10/02 04:40:08 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -54,9 +54,8 @@
 int	mkclock_hb_match __P((struct device *, struct cfdata  *, void *));
 void	mkclock_hb_attach __P((struct device *, struct device *, void *));
 
-const struct cfattach mkclock_hb_ca = {
+CFATTACH_DECL(mkclock_hb, sizeof(struct device),
-	sizeof(struct device), mkclock_hb_match, mkclock_hb_attach
+    mkclock_hb_match, mkclock_hb_attach, NULL, NULL);
-};
 
 extern struct cfdriver mkclock_cd;
 

sys/arch/news68k/dev/ms_hb.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ms_hb.c,v 1.3 2002/09/27 20:34:10 thorpej Exp $	*/
+/*	$NetBSD: ms_hb.c,v 1.4 2002/10/02 04:40:08 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Izumi Tsutsui.  All rights reserved.
@@ -55,9 +55,8 @@ int ms_hb_enable(void *);
 int ms_hb_ioctl(void *, u_long, caddr_t, int, struct proc *);
 void ms_hb_disable(void *);
 
-const struct cfattach ms_hb_ca = {
+CFATTACH_DECL(ms_hb, sizeof(struct ms_softc),
-	sizeof(struct ms_softc), ms_hb_match, ms_hb_attach
+    ms_hb_match, ms_hb_attach, NULL, NULL);
-};
 
 struct wsmouse_accessops ms_hb_accessops = {
 	ms_hb_enable,

sys/arch/news68k/dev/ms_kbc.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: ms_kbc.c,v 1.3 2002/09/27 20:34:11 thorpej Exp $	*/
+/*	$NetBSD: ms_kbc.c,v 1.4 2002/10/02 04:40:08 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Izumi Tsutsui.  All rights reserved.
@@ -52,9 +52,8 @@ int ms_kbc_enable(void *);
 void ms_kbc_disable(void *);
 int ms_kbc_ioctl(void *, u_long, caddr_t, int, struct proc *);
 
-const struct cfattach ms_kbc_ca = {
+CFATTACH_DECL(ms_kbc, sizeof(struct ms_softc),
-	sizeof(struct ms_softc), ms_kbc_match, ms_kbc_attach
+    ms_kbc_match, ms_kbc_attach, NULL, NULL);
-};
 
 struct wsmouse_accessops ms_kbc_accessops = {
 	ms_kbc_enable,

sys/arch/news68k/dev/si.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: si.c,v 1.8 2002/09/27 20:34:11 thorpej Exp $	*/
+/*	$NetBSD: si.c,v 1.9 2002/10/02 04:40:08 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -90,9 +90,8 @@ void si_dma_poll __P((struct ncr5380_softc *));
 void si_dma_eop __P((struct ncr5380_softc *));
 void si_dma_stop __P((struct ncr5380_softc *));
 
-const struct cfattach si_ca = {
+CFATTACH_DECL(si, sizeof(struct si_softc),
-	sizeof(struct si_softc), si_match, si_attach
+    si_match, si_attach, NULL, NULL);
-};
 
 /*
  * Options for disconnect/reselect, DMA, and interrupts.

sys/arch/news68k/dev/timer_hb.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: timer_hb.c,v 1.2 2002/09/27 20:34:12 thorpej Exp $	*/
+/*	$NetBSD: timer_hb.c,v 1.3 2002/10/02 04:40:08 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -69,9 +69,8 @@ static __inline void leds_intr __P((void));
 
 extern void _isr_clock __P((void));	/* locore.s */
 
-const struct cfattach timer_hb_ca = {
+CFATTACH_DECL(timer_hb, sizeof(struct device),
-	sizeof(struct device), timer_hb_match, timer_hb_attach
+    timer_hb_match, timer_hb_attach, NULL, NULL);
-};
 
 static volatile u_int8_t *ctrl_timer; /* XXX */
 

sys/arch/news68k/dev/zs.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.8 2002/09/27 20:34:12 thorpej Exp $	*/
+/*	$NetBSD: zs.c,v 1.9 2002/10/02 04:40:09 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -147,9 +147,8 @@ static int zs_match __P((struct device *, struct cfdata *, void *));
 static void zs_attach __P((struct device *, struct device *, void *));
 static int zs_print __P((void *, const char *name));
 
-const struct cfattach zsc_ca = {
+CFATTACH_DECL(zsc, sizeof(struct zsc_softc),
-	sizeof(struct zsc_softc), zs_match, zs_attach
+    zs_match, zs_attach, NULL, NULL);
-};
 
 extern struct cfdriver zsc_cd;
 

sys/arch/news68k/news68k/mainbus.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.5 2002/09/27 20:34:13 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.6 2002/10/02 04:40:09 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -47,9 +47,8 @@ static void	mainbus_attach __P((struct device *, struct device *, void *));
 static int	mainbus_search __P((struct device *, struct cfdata *, void *));
 static int	mainbus_print __P((void *, const char *));
 
-const struct cfattach mainbus_ca = {
+CFATTACH_DECL(mainbus, sizeof(struct mainbus_softc),
-	sizeof(struct mainbus_softc), mainbus_match, mainbus_attach
+    mainbus_match, mainbus_attach, NULL, NULL);
-};
 
 static int mainbus_found;