[src/trunk]: src/sys/arch/evbppc split device/softc (CFATTACH_DECL_NEW)

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

details:   https://anonhg.NetBSD.org/src/rev/04aa833f0f16
branches:  trunk
changeset: 766188:04aa833f0f16
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jun 18 06:44:25 2011 +0000

description:
split device/softc (CFATTACH_DECL_NEW)
struct device * -> device_t
struct cfdata * -> cfdata_t
Use <sys/foo.h> instead of <machine/foo.h> if <sys/foo.h> exists
Explicitly include <powerpc/ibm4xx/cpu.h> when needed.

diffstat:

 sys/arch/evbppc/ev64260/autoconf.c        |   15 +-
 sys/arch/evbppc/explora/autoconf.c        |   11 +-
 sys/arch/evbppc/explora/dev/fb_elb.c      |   22 ++-
 sys/arch/evbppc/explora/machdep.c         |    9 +-
 sys/arch/evbppc/include/cpu.h             |   11 +-
 sys/arch/evbppc/include/obs405.h          |    4 +-
 sys/arch/evbppc/obs405/dev/century_bios.c |    8 +-
 sys/arch/evbppc/obs405/dev/obsled.c       |   23 ++--
 sys/arch/evbppc/obs405/obs200_autoconf.c  |    7 +-
 sys/arch/evbppc/obs405/obs200_machdep.c   |   11 +-
 sys/arch/evbppc/obs405/obs266_autoconf.c  |   12 +-
 sys/arch/evbppc/obs405/obs266_machdep.c   |   13 +-
 sys/arch/evbppc/obs405/obs405_autoconf.c  |   12 +-
 sys/arch/evbppc/obs405/obs405_machdep.c   |   10 +-
 sys/arch/evbppc/obs405/obs600_autoconf.c  |   10 +-
 sys/arch/evbppc/obs405/obs600_machdep.c   |   12 +-
 sys/arch/evbppc/obs405/rbus_machdep.c     |    7 +-
 sys/arch/evbppc/pmppc/autoconf.c          |    6 +-
 sys/arch/evbppc/pmppc/dev/cpc_mainbus.c   |    6 +-
 sys/arch/evbppc/pmppc/dev/flash.c         |   24 ++--
 sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c |    8 +-
 sys/arch/evbppc/virtex/autoconf.c         |   12 +-
 sys/arch/evbppc/virtex/design_gsrd1.c     |   14 +-
 sys/arch/evbppc/virtex/design_gsrd2.c     |   13 +-
 sys/arch/evbppc/virtex/dev/if_temac.c     |  159 +++++++++++++++--------------
 sys/arch/evbppc/virtex/dev/pstwo.c        |   22 ++--
 sys/arch/evbppc/virtex/dev/tft_ll.c       |   43 +++----
 sys/arch/evbppc/virtex/dev/tft_plb.c      |   32 ++---
 sys/arch/evbppc/virtex/dev/tftvar.h       |    6 +-
 sys/arch/evbppc/virtex/dev/xlcom.c        |   36 +++---
 sys/arch/evbppc/virtex/machdep.c          |    8 +-
 sys/arch/evbppc/walnut/autoconf.c         |   15 +-
 sys/arch/evbppc/walnut/machdep.c          |    8 +-
 sys/arch/evbppc/walnut/pci/pchb.c         |    8 +-
 34 files changed, 312 insertions(+), 305 deletions(-)

diffs (truncated from 2079 to 300 lines):

diff -r 82a33d1b2e53 -r 04aa833f0f16 sys/arch/evbppc/ev64260/autoconf.c
--- a/sys/arch/evbppc/ev64260/autoconf.c        Sat Jun 18 06:41:41 2011 +0000
+++ b/sys/arch/evbppc/ev64260/autoconf.c        Sat Jun 18 06:44:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.14 2010/06/02 06:44:33 kiyohara Exp $   */
+/*     $NetBSD: autoconf.c,v 1.15 2011/06/18 06:44:25 matt Exp $       */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -44,13 +44,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2010/06/02 06:44:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2011/06/18 06:44:25 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
+#include <sys/device_if.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
-#include <sys/types.h>
 
 #include <net/if.h>
 #include <net/if_ether.h>
@@ -77,11 +77,6 @@
        if (config_rootfound("mainbus", NULL) == NULL)
                panic("configure: mainbus not configured");
 
-       aprint_normal("biomask %jx netmask %jx ttymask %jx\n",
-           imask[IPL_BIO] & 0x3fffffffffffffff,
-           imask[IPL_NET] & 0x3fffffffffffffff,
-           imask[IPL_TTY] & 0x3fffffffffffffff);
-
        spl0();
 }
 
@@ -91,7 +86,7 @@
        findroot();
 
        printf("boot device: %s\n",
-           booted_device ? booted_device->dv_xname : "<unknown>");
+           booted_device ? device_xname(booted_device) : "<unknown>");
 
        setroot(booted_device, booted_partition);
 }
@@ -128,7 +123,7 @@
 }
 
 void
-device_register(struct device *dev, void *aux)
+device_register(device_t dev, void *aux)
 {
        prop_dictionary_t dict = device_properties(dev);
 
diff -r 82a33d1b2e53 -r 04aa833f0f16 sys/arch/evbppc/explora/autoconf.c
--- a/sys/arch/evbppc/explora/autoconf.c        Sat Jun 18 06:41:41 2011 +0000
+++ b/sys/arch/evbppc/explora/autoconf.c        Sat Jun 18 06:44:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.10 2008/04/28 20:23:17 martin Exp $     */
+/*     $NetBSD: autoconf.c,v 1.11 2011/06/18 06:44:25 matt Exp $       */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,12 +30,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2011/06/18 06:44:25 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
-#include <sys/device.h>
+#include <sys/device_if.h>
 #include <sys/systm.h>
+#include <sys/cpu.h>
+
+#include <powerpc/ibm4xx/cpu.h>
 
 void
 cpu_configure(void)
@@ -63,6 +66,6 @@
 }
 
 void
-device_register(struct device *dev, void *aux)
+device_register(device_t dev, void *aux)
 {
 }
diff -r 82a33d1b2e53 -r 04aa833f0f16 sys/arch/evbppc/explora/dev/fb_elb.c
--- a/sys/arch/evbppc/explora/dev/fb_elb.c      Sat Jun 18 06:41:41 2011 +0000
+++ b/sys/arch/evbppc/explora/dev/fb_elb.c      Sat Jun 18 06:44:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fb_elb.c,v 1.11 2010/05/15 08:53:26 tsutsui Exp $      */
+/*     $NetBSD: fb_elb.c,v 1.12 2011/06/18 06:44:25 matt Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.11 2010/05/15 08:53:26 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.12 2011/06/18 06:44:25 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -58,13 +58,13 @@
 };
 
 struct fb_elb_softc {
-       struct device sc_dev;
+       device_t sc_dev;
        struct fb_dev *sc_fb;
        int sc_nscreens;
 };
 
-static int     fb_elb_probe(struct device *, struct cfdata *, void *);
-static void    fb_elb_attach(struct device *, struct device *, void *);
+static int     fb_elb_probe(device_t, cfdata_t, void *);
+static void    fb_elb_attach(device_t, device_t, void *);
 void           fb_cnattach(bus_space_tag_t, bus_addr_t, void *);
 static void    fb_init(struct fb_dev *, int);
 static int     fb_ioctl(void *, void *, u_long, void *, int, struct lwp *);
@@ -108,14 +108,14 @@
 };
 
 static struct wsscreen_list screenlist = {
-       sizeof(scrlist)/sizeof(scrlist[0]), scrlist
+       __arraycount(scrlist), scrlist
 };
 
-CFATTACH_DECL(fb_elb, sizeof(struct fb_elb_softc),
+CFATTACH_DECL_NEW(fb_elb, sizeof(struct fb_elb_softc),
     fb_elb_probe, fb_elb_attach, NULL, NULL);
 
 static int
-fb_elb_probe(struct device *parent, struct cfdata *cf, void *aux)
+fb_elb_probe(device_t parent, cfdata_t cf, void *aux)
 {
        struct elb_attach_args *oaa = aux;
 
@@ -126,15 +126,17 @@
 }
 
 static void
-fb_elb_attach(struct device *parent, struct device *self, void *aux)
+fb_elb_attach(device_t parent, device_t self, void *aux)
 {
-       struct fb_elb_softc *sc = (void *)self;
+       struct fb_elb_softc *sc = device_private(self);
        struct elb_attach_args *eaa = aux;
        struct wsemuldisplaydev_attach_args waa;
        struct rasops_info *ri;
        bus_space_handle_t ioh;
        int is_console;
 
+       sc->sc_dev = self;
+
        is_console = ((void *)eaa->elb_base == console_dev.fb_vram);
 
        if (is_console) {
diff -r 82a33d1b2e53 -r 04aa833f0f16 sys/arch/evbppc/explora/machdep.c
--- a/sys/arch/evbppc/explora/machdep.c Sat Jun 18 06:41:41 2011 +0000
+++ b/sys/arch/evbppc/explora/machdep.c Sat Jun 18 06:44:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.34 2011/06/15 05:50:48 matt Exp $        */
+/*     $NetBSD: machdep.c,v 1.35 2011/06/18 06:44:25 matt Exp $        */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.34 2011/06/15 05:50:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.35 2011/06/18 06:44:25 matt Exp $");
 
 #include "opt_explora.h"
 #include "opt_modular.h"
@@ -47,13 +47,14 @@
 #include <sys/ksyms.h>
 #include <sys/device.h>
 #include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 
 #include <uvm/uvm_extern.h>
 
 #include <prop/proplib.h>
 
 #include <machine/explora.h>
-#include <machine/bus.h>
 #include <machine/powerpc.h>
 #include <machine/tlb.h>
 #include <machine/pcb.h>
@@ -61,6 +62,8 @@
 
 #include <powerpc/spr.h>
 #include <powerpc/ibm4xx/spr.h>
+
+#include <powerpc/ibm4xx/cpu.h>
 #include <powerpc/ibm4xx/dcr403cgx.h>
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
diff -r 82a33d1b2e53 -r 04aa833f0f16 sys/arch/evbppc/include/cpu.h
--- a/sys/arch/evbppc/include/cpu.h     Sat Jun 18 06:41:41 2011 +0000
+++ b/sys/arch/evbppc/include/cpu.h     Sat Jun 18 06:44:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.5 2011/06/12 03:42:41 mrg Exp $      */
+/*     $NetBSD: cpu.h,v 1.6 2011/06/18 06:44:26 matt Exp $     */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -43,21 +43,22 @@
 #include "opt_multiprocessor.h"
 #endif
 
+#ifdef _KERNEL
 #ifdef PPC_IBM4XX
-#include <powerpc/ibm4xx/cpu.h>
-#ifdef _KERNEL
 extern int fake_mapiodev;
 #endif
-#else
+
 #ifdef MULTIPROCESSOR
 #define CPU_MAXNUM 2
 #else
 #define CPU_MAXNUM 1
 #endif
+
 #include <powerpc/cpu.h>
-#endif
 
 extern char module_machine_booke[];
 extern char module_machine_ibm4xx[];
 
+#endif /* _KERNEL */
+
 #endif /* _MACHINE_CPU_H_ */
diff -r 82a33d1b2e53 -r 04aa833f0f16 sys/arch/evbppc/include/obs405.h
--- a/sys/arch/evbppc/include/obs405.h  Sat Jun 18 06:41:41 2011 +0000
+++ b/sys/arch/evbppc/include/obs405.h  Sat Jun 18 06:44:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obs405.h,v 1.7 2010/03/18 14:15:38 kiyohara Exp $      */
+/*     $NetBSD: obs405.h,v 1.8 2011/06/18 06:44:26 matt Exp $  */
 
 /*
  * Copyright 2004 Shigeyuki Fukushima.
@@ -39,6 +39,6 @@
 /*
  * extern variables and functions
  */
-extern void obs405_device_register(struct device *dev, void *aux, int com_freq);
+extern void obs405_device_register(device_t dev, void *aux, int com_freq);
 
 #endif /* _EVBPPC_OBS405_H_ */
diff -r 82a33d1b2e53 -r 04aa833f0f16 sys/arch/evbppc/obs405/dev/century_bios.c
--- a/sys/arch/evbppc/obs405/dev/century_bios.c Sat Jun 18 06:41:41 2011 +0000
+++ b/sys/arch/evbppc/obs405/dev/century_bios.c Sat Jun 18 06:44:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: century_bios.c,v 1.4 2007/02/22 05:27:47 thorpej Exp $ */
+/*     $NetBSD: century_bios.c,v 1.5 2011/06/18 06:44:26 matt Exp $    */
 
 /*
  * Copyright (c) 2004 Shigeyuki Fukushima.
@@ -31,12 +31,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: century_bios.c,v 1.4 2007/02/22 05:27:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: century_bios.c,v 1.5 2011/06/18 06:44:26 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/cpu.h>
 
-#include <machine/cpu.h>
+#include <powerpc/ibm4xx/cpu.h>
+
 #include <machine/century_bios.h>
 
 /*
diff -r 82a33d1b2e53 -r 04aa833f0f16 sys/arch/evbppc/obs405/dev/obsled.c
--- a/sys/arch/evbppc/obs405/dev/obsled.c       Sat Jun 18 06:41:41 2011 +0000
+++ b/sys/arch/evbppc/obs405/dev/obsled.c       Sat Jun 18 06:44:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obsled.c,v 1.7 2009/11/05 18:16:00 dyoung Exp $        */
+/*     $NetBSD: obsled.c,v 1.8 2011/06/18 06:44:27 matt Exp $  */
 
 /*
  * Copyright (c) 2004 Shigeyuki Fukushima.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obsled.c,v 1.7 2009/11/05 18:16:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obsled.c,v 1.8 2011/06/18 06:44:27 matt Exp $");