Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Use CFATTACH_DECL().



details:   https://anonhg.NetBSD.org/src/rev/ec2c0eafbf4c
branches:  trunk
changeset: 537509:ec2c0eafbf4c
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Oct 02 04:40:08 2002 +0000

description:
Use CFATTACH_DECL().

diffstat:

 sys/arch/mvmeppc/isa/mkclock_isa.c |  10 ++++------
 sys/arch/mvmeppc/mvmeppc/cpu.c     |   7 +++----
 sys/arch/mvmeppc/mvmeppc/mainbus.c |   7 +++----
 sys/arch/mvmeppc/pci/pchb.c        |   7 +++----
 sys/arch/mvmeppc/pci/pcib.c        |   7 +++----
 sys/arch/netwinder/pci/pcib.c      |   7 +++----
 sys/arch/news68k/dev/hb.c          |   7 +++----
 sys/arch/news68k/dev/if_le.c       |   7 +++----
 sys/arch/news68k/dev/kb_hb.c       |   7 +++----
 sys/arch/news68k/dev/kb_kbc.c      |   7 +++----
 sys/arch/news68k/dev/kbc.c         |   7 +++----
 sys/arch/news68k/dev/mkclock_hb.c  |   7 +++----
 sys/arch/news68k/dev/ms_hb.c       |   7 +++----
 sys/arch/news68k/dev/ms_kbc.c      |   7 +++----
 sys/arch/news68k/dev/si.c          |   7 +++----
 sys/arch/news68k/dev/timer_hb.c    |   7 +++----
 sys/arch/news68k/dev/zs.c          |   7 +++----
 sys/arch/news68k/news68k/mainbus.c |   7 +++----
 18 files changed, 55 insertions(+), 74 deletions(-)

diffs (truncated from 388 to 300 lines):

diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/mvmeppc/isa/mkclock_isa.c
--- a/sys/arch/mvmeppc/isa/mkclock_isa.c        Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/mvmeppc/isa/mkclock_isa.c        Wed Oct 02 04:40:08 2002 +0000
@@ -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 @@
 int    mkclock_isa_match(struct device *, struct cfdata *, void *);
 void   mkclock_isa_attach(struct device *, struct device *, void *);
 
-const struct cfattach mkclock_isa_ca = {
-       sizeof (struct mkclock_isa_softc), mkclock_isa_match,
-           mkclock_isa_attach, 
-};
+CFATTACH_DECL(mkclock_isa, sizeof (struct mkclock_isa_softc),
+    mkclock_isa_match, mkclock_isa_attach, NULL, NULL);
 
 
 /* mk48txx interface */
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/mvmeppc/mvmeppc/cpu.c
--- a/sys/arch/mvmeppc/mvmeppc/cpu.c    Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/mvmeppc/mvmeppc/cpu.c    Wed Oct 02 04:40:08 2002 +0000
@@ -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 = {
-       sizeof(struct device), cpumatch, cpuattach
-};
+CFATTACH_DECL(cpu, sizeof(struct device),
+    cpumatch, cpuattach, NULL, NULL);
 
 extern struct cfdriver cpu_cd;
 
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/mvmeppc/mvmeppc/mainbus.c
--- a/sys/arch/mvmeppc/mvmeppc/mainbus.c        Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/mvmeppc/mvmeppc/mainbus.c        Wed Oct 02 04:40:08 2002 +0000
@@ -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 = {
-       sizeof(struct device), mainbus_match, mainbus_attach
-};
+CFATTACH_DECL(mainbus, sizeof(struct device),
+    mainbus_match, mainbus_attach, NULL, NULL);
 
 int    mainbus_print(void *, const char *);
 
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/mvmeppc/pci/pchb.c
--- a/sys/arch/mvmeppc/pci/pchb.c       Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/mvmeppc/pci/pchb.c       Wed Oct 02 04:40:08 2002 +0000
@@ -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 = {
-       sizeof(struct device), pchbmatch, pchbattach
-};
+CFATTACH_DECL(pchb, sizeof(struct device),
+    pchbmatch, pchbattach, NULL, NULL);
 
 int
 pchbmatch(parent, cf, aux)
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/mvmeppc/pci/pcib.c
--- a/sys/arch/mvmeppc/pci/pcib.c       Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/mvmeppc/pci/pcib.c       Wed Oct 02 04:40:08 2002 +0000
@@ -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 mvmeppc_isa_chipset sc_chipset;
 };
 
-const struct cfattach pcib_ca = {
-       sizeof(struct pcib_softc), pcibmatch, pcibattach
-};
+CFATTACH_DECL(pcib, sizeof(struct pcib_softc),
+    pcibmatch, pcibattach, NULL, NULL);
 
 void   pcib_callback(struct device *);
 int    pcib_print(void *, const char *);
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/netwinder/pci/pcib.c
--- a/sys/arch/netwinder/pci/pcib.c     Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/netwinder/pci/pcib.c     Wed Oct 02 04:40:08 2002 +0000
@@ -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 = {
-       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 -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/news68k/dev/hb.c
--- a/sys/arch/news68k/dev/hb.c Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/news68k/dev/hb.c Wed Oct 02 04:40:08 2002 +0000
@@ -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 int     hb_search __P((struct device *, struct cfdata *, void *));
 static int     hb_print __P((void *, const char *));
 
-const struct cfattach hb_ca = {
-       sizeof(struct device), hb_match, hb_attach
-};
+CFATTACH_DECL(hb, sizeof(struct device),
+    hb_match, hb_attach, NULL, NULL);
 
 extern struct cfdriver hb_cd;
 
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/news68k/dev/if_le.c
--- a/sys/arch/news68k/dev/if_le.c      Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/news68k/dev/if_le.c      Wed Oct 02 04:40:08 2002 +0000
@@ -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 @@
 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 = {
-       sizeof(struct le_softc), le_match, le_attach
-};
+CFATTACH_DECL(le, sizeof(struct le_softc),
+    le_match, le_attach, NULL, NULL);
 
 extern volatile u_char *lance_mem, *idrom_addr;
 
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/news68k/dev/kb_hb.c
--- a/sys/arch/news68k/dev/kb_hb.c      Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/news68k/dev/kb_hb.c      Wed Oct 02 04:40:08 2002 +0000
@@ -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 @@
 int    kb_hb_intr(void *);
 int    kb_hb_cnattach(void);
 
-const struct cfattach kb_hb_ca = {
-       sizeof(struct kb_softc), kb_hb_match, kb_hb_attach
-};
+CFATTACH_DECL(kb_hb, sizeof(struct kb_softc),
+    kb_hb_match, kb_hb_attach, NULL, NULL);
 
 struct console_softc kb_hb_conssc;
 
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/news68k/dev/kb_kbc.c
--- a/sys/arch/news68k/dev/kb_kbc.c     Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/news68k/dev/kb_kbc.c     Wed Oct 02 04:40:08 2002 +0000
@@ -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 @@
 int    kb_kbc_intr(void *);
 int    kb_kbc_cnattach(void);
 
-const struct cfattach kb_kbc_ca = {
-       sizeof(struct kb_softc), kb_kbc_match, kb_kbc_attach
-};
+CFATTACH_DECL(kb_kbc, sizeof(struct kb_softc),
+    kb_kbc_match, kb_kbc_attach, NULL, NULL);
 
 struct console_softc kb_kbc_conssc;
 
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/news68k/dev/kbc.c
--- a/sys/arch/news68k/dev/kbc.c        Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/news68k/dev/kbc.c        Wed Oct 02 04:40:08 2002 +0000
@@ -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 void kbc_attach __P((struct device *, struct device *, void *));
 static int kbc_print __P((void *, const char *name));
 
-const struct cfattach kbc_ca = {
-       sizeof(struct device), kbc_match, kbc_attach
-};
+CFATTACH_DECL(kbc, sizeof(struct device),
+    kbc_match, kbc_attach, NULL, NULL);
 
 extern struct cfdriver kbc_cd;
 
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/news68k/dev/mkclock_hb.c
--- a/sys/arch/news68k/dev/mkclock_hb.c Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/news68k/dev/mkclock_hb.c Wed Oct 02 04:40:08 2002 +0000
@@ -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 = {
-       sizeof(struct device), mkclock_hb_match, mkclock_hb_attach
-};
+CFATTACH_DECL(mkclock_hb, sizeof(struct device),
+    mkclock_hb_match, mkclock_hb_attach, NULL, NULL);
 
 extern struct cfdriver mkclock_cd;
 
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/news68k/dev/ms_hb.c
--- a/sys/arch/news68k/dev/ms_hb.c      Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/news68k/dev/ms_hb.c      Wed Oct 02 04:40:08 2002 +0000
@@ -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_ioctl(void *, u_long, caddr_t, int, struct proc *);
 void ms_hb_disable(void *);
 
-const struct cfattach ms_hb_ca = {
-       sizeof(struct ms_softc), ms_hb_match, ms_hb_attach
-};
+CFATTACH_DECL(ms_hb, sizeof(struct ms_softc),
+    ms_hb_match, ms_hb_attach, NULL, NULL);
 
 struct wsmouse_accessops ms_hb_accessops = {
        ms_hb_enable,
diff -r 85b1c640b710 -r ec2c0eafbf4c sys/arch/news68k/dev/ms_kbc.c
--- a/sys/arch/news68k/dev/ms_kbc.c     Wed Oct 02 04:27:51 2002 +0000
+++ b/sys/arch/news68k/dev/ms_kbc.c     Wed Oct 02 04:40:08 2002 +0000
@@ -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 @@
 void ms_kbc_disable(void *);
 int ms_kbc_ioctl(void *, u_long, caddr_t, int, struct proc *);
 
-const struct cfattach ms_kbc_ca = {
-       sizeof(struct ms_softc), ms_kbc_match, ms_kbc_attach
-};
+CFATTACH_DECL(ms_kbc, sizeof(struct ms_softc),



Home | Main Index | Thread Index | Old Index