[src/trunk]: src/sys/arch More device_t, cfdata, CFATTACH_DECL_NEW cleanup.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9bbfc253d900
branches:  trunk
changeset: 765800:9bbfc253d900
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 06 16:42:17 2011 +0000

description:
More device_t, cfdata, CFATTACH_DECL_NEW cleanup.

diffstat:

 sys/arch/evbppc/explora/dev/elb.c       |  14 +++++++-------
 sys/arch/evbppc/pmppc/dev/cpc_mainbus.c |  16 ++++++++--------
 sys/arch/evbppc/virtex/dev/xcvbus.c     |   8 ++++----
 sys/arch/evbppc/walnut/dev/pbus.c       |  14 +++++++-------
 sys/arch/evbppc/walnut/pci/pchb.c       |  14 +++++++-------
 sys/arch/powerpc/ibm4xx/dev/plb.c       |  14 +++++++-------
 sys/arch/powerpc/ibm4xx/pci/pchb.c      |  14 +++++++-------
 sys/arch/powerpc/pci/pchb.c             |  20 ++++++++++----------
 sys/arch/prep/isa/isabeep.c             |  14 +++++++-------
 sys/arch/prep/pci/pceb.c                |  18 +++++++++---------
 sys/arch/sandpoint/sandpoint/eumb.c     |  19 +++++++++----------
 11 files changed, 82 insertions(+), 83 deletions(-)

diffs (truncated from 591 to 300 lines):

diff -r 0631b77d9563 -r 9bbfc253d900 sys/arch/evbppc/explora/dev/elb.c
--- a/sys/arch/evbppc/explora/dev/elb.c Mon Jun 06 16:29:14 2011 +0000
+++ b/sys/arch/evbppc/explora/dev/elb.c Mon Jun 06 16:42:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elb.c,v 1.6 2008/04/28 20:23:17 martin Exp $   */
+/*     $NetBSD: elb.c,v 1.7 2011/06/06 16:42:17 matt Exp $     */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.6 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.7 2011/06/06 16:42:17 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -54,8 +54,8 @@
        bus_space_tag_t elb_bt;
 };
 
-static int     elb_match(struct device *, struct cfdata *, void *);
-static void    elb_attach(struct device *, struct device *, void *);
+static int     elb_match(device_t, cfdata_t, void *);
+static void    elb_attach(device_t, device_t, void *);
 static int     elb_print(void *, const char *);
 
 static struct powerpc_bus_space elb_tag = {
@@ -109,14 +109,14 @@
        { "le",         BASE_LE,        0,              28, &elb_fb_tag },
 };
 
-CFATTACH_DECL(elb, sizeof(struct device),
+CFATTACH_DECL_NEW(elb, 0,
     elb_match, elb_attach, NULL, NULL);
 
 /*
  * Probe for the elb; always succeeds.
  */
 static int
-elb_match(struct device *parent, struct cfdata *cf, void *aux)
+elb_match(device_t parent, cfdata_t cf, void *aux)
 {
        return (1);
 }
@@ -125,7 +125,7 @@
  * Attach the Explora local bus.
  */
 static void
-elb_attach(struct device *parent, struct device *self, void *aux)
+elb_attach(device_t parent, device_t self, void *aux)
 {
        struct elb_attach_args eaa;
        int i;
diff -r 0631b77d9563 -r 9bbfc253d900 sys/arch/evbppc/pmppc/dev/cpc_mainbus.c
--- a/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c   Mon Jun 06 16:29:14 2011 +0000
+++ b/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c   Mon Jun 06 16:42:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpc_mainbus.c,v 1.3 2008/04/28 20:23:17 martin Exp $   */
+/*     $NetBSD: cpc_mainbus.c,v 1.4 2011/06/06 16:42:17 matt Exp $     */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.3 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.c,v 1.4 2011/06/06 16:42:17 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/extent.h>
@@ -55,18 +55,18 @@
 struct genppc_pci_chipset *genppc_pct;
 
 void
-cpc_attach(struct device *self, pci_chipset_tag_t pc, bus_space_tag_t mem,
+cpc_attach(device_t self, pci_chipset_tag_t pc, bus_space_tag_t mem,
           bus_space_tag_t pciio, bus_dma_tag_t tag, int attachpci,
           uint freq);
 
-static int     cpc_mainbus_match(struct device *, struct cfdata *, void *);
-static void    cpc_mainbus_attach(struct device *, struct device *, void *);
+static int     cpc_mainbus_match(device_t, cfdata_t, void *);
+static void    cpc_mainbus_attach(device_t, device_t, void *);
 
-CFATTACH_DECL(cpc_mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(cpc_mainbus, 0,
     cpc_mainbus_match, cpc_mainbus_attach, NULL, NULL);
 
 int
-cpc_mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+cpc_mainbus_match(device_t parent, cfdata_t cf, void *aux)
 {
        struct mainbus_attach_args *maa = aux;
 
@@ -74,7 +74,7 @@
 }
 
 void
-cpc_mainbus_attach(struct device *parent, struct device *self, void *aux)
+cpc_mainbus_attach(device_t parent, device_t self, void *aux)
 {
        struct genppc_pci_chipset_businfo *pbi;
 
diff -r 0631b77d9563 -r 9bbfc253d900 sys/arch/evbppc/virtex/dev/xcvbus.c
--- a/sys/arch/evbppc/virtex/dev/xcvbus.c       Mon Jun 06 16:29:14 2011 +0000
+++ b/sys/arch/evbppc/virtex/dev/xcvbus.c       Mon Jun 06 16:42:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xcvbus.c,v 1.1 2006/12/02 22:18:47 freza Exp $ */
+/*     $NetBSD: xcvbus.c,v 1.2 2011/06/06 16:42:18 matt Exp $ */
 
 /*
  * Copyright (c) 2006 Jachym Holecek
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1.1 2006/12/02 22:18:47 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1.2 2011/06/06 16:42:18 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,7 +49,7 @@
 static void    xcvbus_attach(device_t, device_t, void *);
 
 
-CFATTACH_DECL(xcvbus, sizeof(struct device),
+CFATTACH_DECL_NEW(xcvbus, 0,
     xcvbus_match, xcvbus_attach, NULL, NULL);
 
 
@@ -101,7 +101,7 @@
 }
 
 int
-xcvbus_child_match(struct device *parent, struct cfdata *cf, void *aux)
+xcvbus_child_match(device_t parent, cfdata_t cf, void *aux)
 {
        struct xcvbus_attach_args *vaa = aux;
 
diff -r 0631b77d9563 -r 9bbfc253d900 sys/arch/evbppc/walnut/dev/pbus.c
--- a/sys/arch/evbppc/walnut/dev/pbus.c Mon Jun 06 16:29:14 2011 +0000
+++ b/sys/arch/evbppc/walnut/dev/pbus.c Mon Jun 06 16:42:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pbus.c,v 1.10 2006/05/04 10:53:06 simonb Exp $ */
+/*     $NetBSD: pbus.c,v 1.11 2011/06/06 16:42:18 matt Exp $   */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.10 2006/05/04 10:53:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.11 2011/06/06 16:42:18 matt Exp $");
 
 #include "locators.h"
 #include "pckbc.h"
@@ -96,11 +96,11 @@
        { NULL }
 };
 
-static int     pbus_match(struct device *, struct cfdata *, void *);
-static void    pbus_attach(struct device *, struct device *, void *);
+static int     pbus_match(device_t, cfdata_t, void *);
+static void    pbus_attach(device_t, device_t, void *);
 static int     pbus_print(void *, const char *);
 
-CFATTACH_DECL(pbus, sizeof(struct device),
+CFATTACH_DECL_NEW(pbus, 0,
     pbus_match, pbus_attach, NULL, NULL);
 
 static struct powerpc_bus_space pbus_tag = {
@@ -114,7 +114,7 @@
  * Probe for the peripheral bus.
  */
 static int
-pbus_match(struct device *parent, struct cfdata *cf, void *aux)
+pbus_match(device_t parent, cfdata_t cf, void *aux)
 {
        struct pbus_attach_args *pba = aux;
 
@@ -129,7 +129,7 @@
  * Attach the peripheral bus.
  */
 static void
-pbus_attach(struct device *parent, struct device *self, void *aux)
+pbus_attach(device_t parent, device_t self, void *aux)
 {
        struct plb_attach_args *paa = aux;
        struct pbus_attach_args pba;
diff -r 0631b77d9563 -r 9bbfc253d900 sys/arch/evbppc/walnut/pci/pchb.c
--- a/sys/arch/evbppc/walnut/pci/pchb.c Mon Jun 06 16:29:14 2011 +0000
+++ b/sys/arch/evbppc/walnut/pci/pchb.c Mon Jun 06 16:42:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pchb.c,v 1.9 2011/05/17 17:34:49 dyoung Exp $  */
+/*     $NetBSD: pchb.c,v 1.10 2011/06/06 16:42:18 matt Exp $   */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.9 2011/05/17 17:34:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.10 2011/06/06 16:42:18 matt Exp $");
 
 #include "pci.h"
 #include "opt_pci.h"
@@ -52,11 +52,11 @@
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciconf.h>
 
-static int     pchbmatch(struct device *, struct cfdata *, void *);
-static void    pchbattach(struct device *, struct device *, void *);
+static int     pchbmatch(device_t, cfdata_t, void *);
+static void    pchbattach(device_t, device_t, void *);
 static int     pchbprint(void *, const char *);
 
-CFATTACH_DECL(pchb, sizeof(struct device),
+CFATTACH_DECL_NEW(pchb, 0,
     pchbmatch, pchbattach, NULL, NULL);
 
 static int pcifound = 0;
@@ -79,7 +79,7 @@
 
 
 static int
-pchbmatch(struct device *parent, struct cfdata *cf, void *aux)
+pchbmatch(device_t parent, cfdata_t cf, void *aux)
 {
        struct plb_attach_args *paa = aux;
        /* XXX chipset tag unused by walnut, so just pass 0 */
@@ -115,7 +115,7 @@
 }
 
 static void
-pchbattach(struct device *parent, struct device *self, void *aux)
+pchbattach(device_t parent, device_t self, void *aux)
 {
        struct plb_attach_args *paa = aux;
        struct pcibus_attach_args pba;
diff -r 0631b77d9563 -r 9bbfc253d900 sys/arch/powerpc/ibm4xx/dev/plb.c
--- a/sys/arch/powerpc/ibm4xx/dev/plb.c Mon Jun 06 16:29:14 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/plb.c Mon Jun 06 16:42:17 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.18 2010/12/13 07:29:12 kiyohara Exp $ */
+/* $NetBSD: plb.c,v 1.19 2011/06/06 16:42:18 matt Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.18 2010/12/13 07:29:12 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.19 2011/06/06 16:42:18 matt Exp $");
 
 #include "locators.h"
 #include "emac.h"
@@ -111,11 +111,11 @@
        { 0,            NULL }
 };
 
-static int     plb_match(struct device *, struct cfdata *, void *);
-static void    plb_attach(struct device *, struct device *, void *);
+static int     plb_match(device_t, cfdata_t, void *);
+static void    plb_attach(device_t, device_t, void *);
 static int     plb_print(void *, const char *);
 
-CFATTACH_DECL(plb, sizeof(struct device), plb_match, plb_attach, NULL, NULL);
+CFATTACH_DECL_NEW(plb, 0, plb_match, plb_attach, NULL, NULL);
 
 /*
  * "generic" DMA struct, nothing special.
@@ -143,7 +143,7 @@
  * Probe for the plb; always succeeds.
  */
 static int
-plb_match(struct device *parent, struct cfdata *cf, void *aux)
+plb_match(device_t parent, cfdata_t cf, void *aux)
 {
 
        return 1;
@@ -153,7 +153,7 @@
  * Attach the processor local bus.
  */
 static void
-plb_attach(struct device *parent, struct device *self, void *aux)
+plb_attach(device_t parent, device_t self, void *aux)
 {
        struct plb_attach_args paa;
        struct plb_dev *local_plb_devs = aux;
diff -r 0631b77d9563 -r 9bbfc253d900 sys/arch/powerpc/ibm4xx/pci/pchb.c
--- a/sys/arch/powerpc/ibm4xx/pci/pchb.c        Mon Jun 06 16:29:14 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/pci/pchb.c        Mon Jun 06 16:42:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pchb.c,v 1.7 2011/05/17 17:34:52 dyoung Exp $  */