 @@ -1,260 +1,260 @@
-/*	$NetBSD: mainbus.c,v 1.21 2011/02/20 07:51:21 matt Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.22 2011/06/05 17:03:18 matt Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2011/02/20 07:51:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22 2011/06/05 17:03:18 matt Exp $");
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
 #include "opt_algor_p6032.h"
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <machine/bus.h>
 #include <machine/autoconf.h>
 #include <mips/cache.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 #if defined(PCI_NETBSD_CONFIGURE) && defined(PCI_NETBSD_ENABLE_IDE)
 #if defined(ALGOR_P5064) || defined(ALGOR_P6032)
 #include <dev/pci/pciide_piix_reg.h>
 #endif /* ALGOR_P5064 || ALGOR_P6032 */
 #endif /* PCI_NETBSD_CONFIGURE && PCI_NETBSD_ENABLE_IDE */
 #include "locators.h"
 #include "pci.h"
-int	mainbus_match(struct device *, struct cfdata *, void *);
+int	mainbus_match(device_t, cfdata_t, void *);
-void	mainbus_attach(struct device *, struct device *, void *);
+void	mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 int	mainbus_print(void *, const char *);
-int	mainbus_submatch(struct device *, struct cfdata *,
+int	mainbus_submatch(device_t, cfdata_t,
 			 const int *, void *);
 /* There can be only one. */
 int	mainbus_found;
 struct mainbusdev {
 	const char *md_name;
 	bus_addr_t md_addr;
 	int md_irq;
 };
 #if defined(ALGOR_P4032)
 #include <algor/algor/algor_p4032reg.h>
 #include <algor/algor/algor_p4032var.h>
 struct mainbusdev mainbusdevs[] = {
 	{ "cpu",		-1,			-1 },
 	{ "mcclock",		P4032_RTC,		P4032_IRQ_RTC },
 	{ "com",		P4032_COM1,		P4032_IRQ_COM1 },
 	{ "com",		P4032_COM2,		P4032_IRQ_COM2 },
 	{ "lpt",		P4032_LPT,		P4032_IRQ_LPT },
 	{ "pckbc",		P4032_PCKBC,		P4032_IRQ_PCKBC },
 	{ "fdc",		P4032_FDC,		P4032_IRQ_FLOPPY },
 	{ "vtpbc",		P4032_V962PBC,		-1 },
 	{ NULL,			0,			0 },
 };
 #endif /* ALGOR_P4032 */
 #if defined(ALGOR_P5064)
 #include <algor/algor/algor_p5064reg.h>
 #include <algor/algor/algor_p5064var.h>
 struct mainbusdev mainbusdevs[] = {
 	{ "cpu",		-1,			-1 },
 	{ "vtpbc",		P5064_V360EPC,		-1 },
 	{ NULL,			0,			0 },
 };
 #endif /* ALGOR_P5064 */
 #if defined(ALGOR_P6032)
 #include <algor/algor/algor_p6032reg.h>
 #include <algor/algor/algor_p6032var.h>
 struct mainbusdev mainbusdevs[] = {
 	{ "cpu",		-1,			-1 },
 	{ "bonito",		BONITO_REG_BASE,	-1 },
 	{ NULL,			0,			0 },
 };
 #endif /* ALGOR_P6032 */
 int
-mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	if (mainbus_found)
 		return (0);
 	return (1);
+}
 void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args ma;
 	struct mainbusdev *md;
 	bus_space_tag_t st;
 #if defined(PCI_NETBSD_CONFIGURE)
 	struct extent *ioext, *memext;
 	pci_chipset_tag_t pc;
 #if defined(PCI_NETBSD_ENABLE_IDE)
 	pcitag_t idetag;
 	pcireg_t idetim;
 #endif
 #endif
 	mainbus_found = 1;
 	printf("\n");
 #if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
 #if defined(ALGOR_P4032)
 	/*
 	 * Reserve the bottom 64K of the I/O space for ISA devices.
 	 */
 	ioext  = extent_create("pciio",  0x00010000, 0x000effff,
 	    M_DEVBUF, NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", 0x01000000, 0x07ffffff,
 	    M_DEVBUF, NULL, 0, EX_NOWAIT);
 	pc = &p4032_configuration.ac_pc;
 #elif defined(ALGOR_P5064)
 	/*
 	 * Reserve the bottom 512K of the I/O space for ISA devices.
 	 * According to the PMON sources, this is a work-around for
 	 * a bug in the ISA bridge.
 	 */
 	ioext  = extent_create("pciio",  0x00080000, 0x00ffffff,
 	    M_DEVBUF, NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", 0x01000000, 0x07ffffff,
 	    M_DEVBUF, NULL, 0, EX_NOWAIT);
 	pc = &p5064_configuration.ac_pc;
 #if defined(PCI_NETBSD_ENABLE_IDE)
 	idetag = pci_make_tag(pc, 0, 2, 1);
 #endif
 #elif defined(ALGOR_P6032)
 	/*
 	 * Reserve the bottom 64K of the I/O space for ISA devices.
 	 */
 	ioext  = extent_create("pciio",  0x00010000, 0x000effff,
 	    M_DEVBUF, NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", 0x01000000, 0x0affffff,
 	    M_DEVBUF, NULL, 0, EX_NOWAIT);
 	pc = &p6032_configuration.ac_pc;
 #if defined(PCI_NETBSD_ENABLE_IDE)
 	idetag = pci_make_tag(pc, 0, 17, 1);
 #endif
 #endif /* ALGOR_P4032 || ALGOR_P5064 || ALGOR_P6032 */
 	pci_configure_bus(pc, ioext, memext, NULL, 0, mips_cache_info.mci_dcache_align);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #if defined(PCI_NETBSD_ENABLE_IDE)
 	/*
 	 * Perhaps PMON has not enabled the IDE controller.  Easy to
 	 * fix -- just set the ENABLE bits for each channel in the
 	 * IDETIM register.  Just clear all the bits for the channel
 	 * except for the ENABLE bits -- the `pciide' driver will
 	 * properly configure it later.
 	 */
 	idetim = 0;
 	if (PCI_NETBSD_ENABLE_IDE & 0x01)
 		idetim = PIIX_IDETIM_SET(idetim, PIIX_IDETIM_IDE, 0);
 	if (PCI_NETBSD_ENABLE_IDE & 0x02)
 		idetim = PIIX_IDETIM_SET(idetim, PIIX_IDETIM_IDE, 1);
 	pci_conf_write(pc, idetag, PIIX_IDETIM, idetim);
 #endif
 #endif /* NPCI > 0 && defined(PCI_NETBSD_CONFIGURE) */
 #if defined(ALGOR_P4032)
 	st = &p4032_configuration.ac_lociot;
 #elif defined(ALGOR_P5064)
 	st = NULL;
 #elif defined(ALGOR_P6032)
 	st = NULL;
 #endif
 	for (md = mainbusdevs; md->md_name != NULL; md++) {
 		ma.ma_name = md->md_name;
 		ma.ma_st = st;
 		ma.ma_addr = md->md_addr;
 		ma.ma_irq = md->md_irq;
 		(void) config_found_sm_loc(self, "mainbus", NULL, &ma,
 		    mainbus_print, mainbus_submatch);
+	}
+}
 int
 mainbus_print(void *aux, const char *pnp)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (pnp)
 		aprint_normal("%s at %s", ma->ma_name, pnp);
 	if (ma->ma_addr != (bus_addr_t) -1)
 		aprint_normal(" addr 0x%lx", ma->ma_addr);
 	return (UNCONF);
+}
 int
-mainbus_submatch(struct device *parent, struct cfdata *cf,
+mainbus_submatch(device_t parent, cfdata_t cf,
 		 const int *ldesc, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (cf->cf_loc[MAINBUSCF_ADDR] != MAINBUSCF_ADDR_DEFAULT &&
 	    cf->cf_loc[MAINBUSCF_ADDR] != ma->ma_addr)
 		return (0);
 	return (config_match(parent, cf, aux));
+}

 @@ -1,69 +1,69 @@
-/*	$NetBSD: cpu.c,v 1.1 2009/07/21 09:49:15 phx Exp $	*/
+/*	$NetBSD: cpu.c,v 1.2 2011/06/05 17:03:16 matt Exp $	*/
 /*-
  * Copyright (c) 2008,2009 Frank Wille.
  * All rights reserved.
+ *
  * Written by Frank Wille for The NetBSD Project.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.1 2009/07/21 09:49:15 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.2 2011/06/05 17:03:16 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <amiga/amiga/device.h>
-int cpu_match(struct device *, struct cfdata *, void *);
+int cpu_match(device_t, cfdata_t, void *);
-void cpu_attach(struct device *, struct device *, void *);
+void cpu_attach(device_t, device_t, void *);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
     cpu_match, cpu_attach, NULL, NULL);
 extern struct cfdriver cpu_cd;
 int
-cpu_match(struct device *parent, struct cfdata *cf, void *aux)
+cpu_match(device_t parent, cfdata_t cf, void *aux)
+{
 	if (strcmp((char *)aux, cpu_cd.cd_name) != 0)
 		return 0;
 	if (amiga_realconfig == 0 || cpu_info[0].ci_dev != NULL)
 		return 0;
 	return 1;
+}
 void
-cpu_attach(struct device *parent, struct device *self, void *aux)
+cpu_attach(device_t parent, device_t self, void *aux)
+{
 	if (amiga_realconfig)
 		(void)cpu_attach_common(self, 0);
+}

 @@ -1,141 +1,141 @@
-/*	$NetBSD: mainbus.c,v 1.2 2010/05/21 12:52:14 phx Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.3 2011/06/05 17:03:16 matt Exp $	*/
 /*-
  * Copyright (c) 2008,2009 Frank Wille.
  * All rights reserved.
+ *
  * Written by Frank Wille for The NetBSD Project.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Copyright (c) 1994 Christian E. Hopps
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by Christian E. Hopps.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2010/05/21 12:52:14 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2011/06/05 17:03:16 matt Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <amiga/amiga/cfdev.h>
 #include <amiga/amiga/device.h>
 #if 0
 #include "mainbus.h"
 #if NCPU == 0
 #error	A cpu device is now required
 #endif
 #endif
-void mbattach(struct device *, struct device *, void *);
+void mbattach(device_t, device_t, void *);
 int mbprint(void *, const char *);
-int mbmatch(struct device *, struct cfdata *, void *);
+int mbmatch(device_t, cfdata_t, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mbmatch, mbattach, NULL, NULL);
 int
-mbmatch(struct device *parent, struct cfdata *cfp, void *aux)
+mbmatch(device_t parent, cfdata_t cfp, void *aux)
+{
 	return 1;
+}
 void
-mbattach(struct device *parent, struct device *self, void *aux)
+mbattach(device_t parent, device_t self, void *aux)
+{
 	printf("\n");
 	/*
 	 * Always find the CPU
 	 */
 	config_found_ia(self, "mainbus", __UNCONST("cpu"), mbprint);
 	/*
 	 * "find" all the things that should be there.
 	 */
 	if (is_a3000() || is_a4000())
 		config_found(self, __UNCONST("a34kbbc"), simple_devprint);
 	else
 		config_found(self, __UNCONST("a2kbbc"), simple_devprint);
 	config_found(self, __UNCONST("ser"), simple_devprint);
 	config_found(self, __UNCONST("par"), simple_devprint);
 	config_found(self, __UNCONST("kbd"), simple_devprint);
 	config_found(self, __UNCONST("ms"), simple_devprint);
 	config_found(self, __UNCONST("grfcc"), simple_devprint);
 	config_found(self, __UNCONST("amidisplaycc"), simple_devprint);
 	config_found(self, __UNCONST("fdc"), simple_devprint);
 	if (is_a4000() || is_a1200())
 		config_found(self, __UNCONST("wdc"), simple_devprint);
 	if (is_a4000())			/* Try to configure A4000T SCSI */
 		config_found(self, __UNCONST("afsc"), simple_devprint);
 	if (is_a3000())
 		config_found(self, __UNCONST("ahsc"), simple_devprint);
 	if (is_a1200())
 		config_found(self, __UNCONST("pccard"), simple_devprint);
 	config_found(self, __UNCONST("aucc"), simple_devprint);
 	config_found(self, __UNCONST("zbus"), simple_devprint);
+}
 int
 mbprint(void *aux, const char *pnp)
+{
 	if (pnp)
 		aprint_normal("%s at %s", (char *)aux, pnp);
 	return UNCONF;
+}

 @@ -1,95 +1,95 @@
-/*	$NetBSD: cpu_mainbus.c,v 1.10 2009/03/14 15:36:02 dsl Exp $	*/
+/*	$NetBSD: cpu_mainbus.c,v 1.11 2011/06/05 17:03:16 matt Exp $	*/
 /*
  * Copyright (c) 1995 Mark Brinicombe.
  * Copyright (c) 1995 Brini.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by Brini.
  * 4. The name of the company nor the name of the author may be used to
  *    endorse or promote products derived from this software without specific
  *    prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * RiscBSD kernel project
+ *
  * cpu.c
+ *
  * Probing and configuration for the master cpu
+ *
  * Created      : 10/10/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.10 2009/03/14 15:36:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.11 2011/06/05 17:03:16 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #if 0
 #include <sys/conf.h>
 #include <uvm/uvm_extern.h>
 #include <machine/io.h>
 #endif
 #include <machine/cpu.h>
 #if 0
 #include <arm/cpus.h>
 #include <arm/undefined.h>
 #endif
 /*
  * Prototypes
  */
-static int cpu_mainbus_match(struct device *, struct cfdata *, void *);
+static int cpu_mainbus_match(device_t, cfdata_t, void *);
-static void cpu_mainbus_attach(struct device *, struct device *, void *);
+static void cpu_mainbus_attach(device_t, device_t, void *);
 /*
- * int cpumatch(struct device *parent, struct cfdata *cf, void *aux)
+ * int cpumatch(device_t parent, cfdata_t cf, void *aux)
+ *
  * Probe for the main cpu. Currently all this does is return 1 to
  * indicate that the cpu was found.
  */
 static int
-cpu_mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+cpu_mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return(1);
+}
 /*
- * void cpusattach(struct device *parent, struct device *dev, void *aux)
+ * void cpusattach(device_t parent, device_t dev, void *aux)
+ *
  * Attach the main cpu
  */
 static void
-cpu_mainbus_attach(struct device *parent, struct device *self, void *aux)
+cpu_mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	cpu_attach(self);
+}
-CFATTACH_DECL(cpu_mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu_mainbus, 0,
     cpu_mainbus_match, cpu_mainbus_attach, NULL, NULL);

 @@ -1,172 +1,172 @@
-/* $NetBSD: mainbus.c,v 1.16 2009/03/14 15:36:02 dsl Exp $ */
+/* $NetBSD: mainbus.c,v 1.17 2011/06/05 17:03:16 matt Exp $ */
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by Brini.
  * 4. The name of the company nor the name of the author may be used to
  *    endorse or promote products derived from this software without specific
  *    prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * RiscBSD kernel project
+ *
  * mainbus.c
+ *
  * mainbus configuration
+ *
  * Created      : 15/12/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16 2009/03/14 15:36:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2011/06/05 17:03:16 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #if defined(arm32)		/* XXX */
 #include <machine/io.h>
 #endif
 #include <machine/bus.h>
 #include <arm/mainbus/mainbus.h>
 #include "locators.h"
 /*
  * mainbus is a root device so we a bus space tag to pass to children
+ *
  * The tag is provided by mainbus_io.c and mainbus_io_asm.S
  */
 extern struct bus_space mainbus_bs_tag;
 /* Prototypes for functions provided */
-static int  mainbusmatch(struct device *, struct cfdata *, void *);
+static int  mainbusmatch(device_t, cfdata_t, void *);
-static void mainbusattach(struct device *, struct device *, void *);
+static void mainbusattach(device_t, device_t, void *);
 static int  mainbusprint(void *aux, const char *mainbus);
-static int  mainbussearch(struct device *, struct cfdata *,
+static int  mainbussearch(device_t, cfdata_t,
 				const int *, void *);
 /* attach and device structures for the device */
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbusmatch, mainbusattach, NULL, NULL);
 /*
- * int mainbusmatch(struct device *parent, struct cfdata *cf, void *aux)
+ * int mainbusmatch(device_t parent, cfdata_t cf, void *aux)
+ *
  * Always match for unit 0
  */
 static int
-mainbusmatch(struct device *parent, struct cfdata *cf, void *aux)
+mainbusmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	return (1);
+}
 /*
  * int mainbusprint(void *aux, const char *mainbus)
+ *
  * print routine used during config of children
  */
 static int
 mainbusprint(void *aux, const char *mainbus)
+{
 	struct mainbus_attach_args *mb = aux;
 	if (mb->mb_iobase != MAINBUSCF_BASE_DEFAULT)
 		aprint_normal(" base 0x%x", mb->mb_iobase);
 	if (mb->mb_iosize > 1)
 		aprint_normal("-0x%x", mb->mb_iobase + mb->mb_iosize - 1);
 	if (mb->mb_irq != -1)
 		aprint_normal(" irq %d", mb->mb_irq);
 	if (mb->mb_drq != -1)
 		aprint_normal(" drq 0x%08x", mb->mb_drq);
 /* XXXX print flags */
 	return (QUIET);
+}
 /*
- * int mainbussearch(struct device *parent, struct device *self, void *aux)
+ * int mainbussearch(device_t parent, device_t self, void *aux)
+ *
  * search routine used during the config of children
  */
 static int
-mainbussearch(struct device *parent, struct cfdata *cf, const int *ldesc, void *aux)
+mainbussearch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct mainbus_attach_args mb;
 	int tryagain;
 	do {
 		if (cf->cf_loc[MAINBUSCF_BASE] == MAINBUSCF_BASE_DEFAULT) {
 			mb.mb_iobase = MAINBUSCF_BASE_DEFAULT;
 			mb.mb_iosize = 0;
 			mb.mb_drq = MAINBUSCF_DACK_DEFAULT;
 			mb.mb_irq = MAINBUSCF_IRQ_DEFAULT;
 		} else {
 			mb.mb_iobase = cf->cf_loc[MAINBUSCF_BASE];
 #if defined(arm32) && !defined(EB7500ATX)
 			mb.mb_iobase += IO_CONF_BASE;
 #endif
 			mb.mb_iosize = cf->cf_loc[MAINBUSCF_SIZE];
 			mb.mb_drq = cf->cf_loc[MAINBUSCF_DACK];
 			mb.mb_irq = cf->cf_loc[MAINBUSCF_IRQ];
+		}
 		mb.mb_iot = &mainbus_bs_tag;
 		tryagain = 0;
 		if (config_match(parent, cf, &mb) > 0) {
 			config_attach(parent, cf, &mb, mainbusprint);
 /*			tryagain = (cf->cf_fstate == FSTATE_STAR);*/
+		}
 	} while (tryagain);
 	return (0);
+}
 /*
- * void mainbusattach(struct device *parent, struct device *self, void *aux)
+ * void mainbusattach(device_t parent, device_t self, void *aux)
+ *
  * probe and attach all children
  */
 static void
-mainbusattach(struct device *parent, struct device *self, void *aux)
+mainbusattach(device_t parent, device_t self, void *aux)
+{
 	aprint_naive("\n");
 	aprint_normal("\n");
 	config_search_ia(mainbussearch, self, "mainbus", NULL);
+}
 /* End of mainbus.c */

 @@ -1,91 +1,91 @@
-/* $NetBSD: mainbus.c,v 1.1 2011/01/26 01:18:50 pooka Exp $ */
+/* $NetBSD: mainbus.c,v 1.2 2011/06/05 17:03:16 matt Exp $ */
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
  * DECstation port: Jonathan Stone
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
  * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.1 2011/01/26 01:18:50 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2011/06/05 17:03:16 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/sysconf.h>
 #include <machine/autoconf.h>
 /* Definition of the mainbus driver. */
-static int	mbmatch(struct device *, struct cfdata *, void *);
+static int	mbmatch(device_t, cfdata_t, void *);
-static void	mbattach(struct device *, struct device *, void *);
+static void	mbattach(device_t, device_t, void *);
 static int	mbprint(void *, const char *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mbmatch, mbattach, NULL, NULL);
 static int mainbus_found;
 static int
-mbmatch(struct device *parent, struct cfdata *cf, void *aux)
+mbmatch(device_t parent, cfdata_t cf, void *aux)
+{
 	if (mainbus_found)
 		return (0);
 	return (1);
+}
 int ncpus = 0;	/* only support uniprocessors, for now */
 static void
-mbattach(struct device *parent, struct device *self, void *aux)
+mbattach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args ma;
 	mainbus_found = 1;
 	printf("\n");
 	/* Interrupt initialization, phase 1 */
 	intr_init(1);
  	ma.ma_name = "cpu";
 	ma.ma_slot = 0;
 	config_found(self, &ma, mbprint);
 	ma.ma_name = platform.iobus;
 	ma.ma_slot = 0;
 	config_found(self, &ma, mbprint);
+}
 static int
 mbprint(void *aux, const char *pnp)
+{
 	if (pnp)
 		return (QUIET);
 	return (UNCONF);
+}

 @@ -1,147 +1,147 @@
-/*	$NetBSD: mainbus.c,v 1.6 2010/04/28 13:51:55 kiyohara Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.7 2011/06/05 17:03:18 matt Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by Christopher G. Demetriou
  *	for the NetBSD Project.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2010/04/28 13:51:55 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.7 2011/06/05 17:03:18 matt Exp $");
 #include "mainbus.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <evbppc/ev64260/ev64260.h>
 #include "locators.h"
 #if NCPU == 0
 #error	A cpu device is now required
 #endif
 int	mainbus_match(device_t, cfdata_t, void *);
 void	mainbus_attach(device_t, device_t, void *);
 int	mainbus_cfprint(void *, const char *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
 	mainbus_match, mainbus_attach, NULL, NULL);
 /*
  * Probe for the mainbus; always succeeds.
  */
 int
 mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}
 /*
  * Attach the mainbus.
  */
 void
 mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args mba;
 	extern bus_addr_t gt_base;
 	printf("\n");
 	memset(&mba, 0, sizeof(mba));
 	/*
 	 * Always find the CPU
 	 */
 	mba.mba_name = "cpu";
 	mba.mba_unit = 0;
 	mba.mba_addr = MAINBUSCF_ADDR_DEFAULT;
 	config_found(self, &mba, mainbus_cfprint);
 #ifdef MULTIPROCESSOR
 	/*
 	 * Try for a second one...
 	 */
 	mba.mba_name = "cpu";
 	mba.mba_unit = 1;
 	mba.mba_addr = MAINBUSCF_ADDR_DEFAULT;
 	config_found(self, &mba, mainbus_cfprint);
 #endif
 	/*
 	 * Now try to configure the Discovery
 	 */
 	mba.mba_name = "gt";
 	mba.mba_unit = -1;
 	mba.mba_addr = gt_base;
 	config_found(self, &mba, mainbus_cfprint);
+}
 int
 mainbus_cfprint(void *aux, const char *pnp)
+{
 	struct mainbus_attach_args *mba = aux;
 	if (pnp)
 		aprint_normal("%s at %s", mba->mba_name, pnp);
 	if (mba->mba_unit != -1)
 		aprint_normal(" unit %d", mba->mba_unit);
 	if (mba->mba_addr != MAINBUSCF_ADDR_DEFAULT)
 		aprint_normal(" addr 0x%08x", mba->mba_addr);
 	return UNCONF;
+}
 static int	cpu_match(device_t, cfdata_t, void *);
 static void	cpu_attach(device_t, device_t, void *);
-CFATTACH_DECL(cpu, sizeof(struct device), cpu_match, cpu_attach, NULL, NULL);
+CFATTACH_DECL_NEW(cpu, 0, cpu_match, cpu_attach, NULL, NULL);
 int
 cpu_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *mba = aux;
 	if (strcmp(mba->mba_name, "cpu") != 0)
 		return 0;
 	return 1;
+}
 void
 cpu_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args *mba = aux;
 	(void) cpu_attach_common(self, mba->mba_unit);
+}

 @@ -1,179 +1,179 @@
-/*	$NetBSD: mainbus.c,v 1.3 2008/04/28 20:23:17 martin Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.4 2011/06/05 17:03:18 matt Exp $	*/
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at Sandburst Corp.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2011/06/05 17:03:18 matt Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <machine/bus.h>
 #include <machine/pmppc.h>
 #include <arch/evbppc/pmppc/dev/mainbus.h>
 #include <dev/ic/cpc700reg.h>
 #include "locators.h"
 #include "mainbus.h"
 #if NCPU == 0
 #error	A cpu device is now required
 #endif
-int	mainbus_match(struct device *, struct cfdata *, void *);
+int	mainbus_match(device_t, cfdata_t, void *);
-void	mainbus_attach(struct device *, struct device *, void *);
+void	mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 static int mainbus_print(void *, const char *);
 /*
  * Probe for the mainbus; always succeeds.
  */
 int
-mainbus_match(struct device *parent, struct cfdata *match, void *aux)
+mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}
 static int
-mainbus_submatch(struct device *parent, struct cfdata *cf,
+mainbus_submatch(device_t parent, cfdata_t cf,
 		 const int *ldesc, void *aux)
+{
 	struct mainbus_attach_args *maa = aux;
 	if (cf->cf_loc[MAINBUSCF_ADDR] != maa->mb_addr)
 		return (0);
 	return (config_match(parent, cf, aux));
+}
 static int
 mainbus_print(void *aux, const char *pnp)
+{
 	struct mainbus_attach_args *mba = aux;
 	if (pnp)
 		aprint_normal("%s at %s", mba->mb_name, pnp);
 	if (mba->mb_addr != MAINBUSCF_ADDR_DEFAULT)
 		aprint_normal(" addr 0x%08lx", mba->mb_addr);
 	if (mba->mb_irq != MAINBUSCF_IRQ_DEFAULT)
 		aprint_normal(" irq %d", mba->mb_irq);
 	return (UNCONF);
+}
 /*
  * Attach the mainbus.
  */
 void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args maa;
 	printf(": Artesyn PM/PPC\n");
 	printf("%s: %sPCI bus Monarch\n", self->dv_xname,
 	       a_config.a_is_monarch ? "" : "not");
 	printf("%s: boot from %s, %sECC, %s L2 cache\n",
 	       self->dv_xname,
 	       a_config.a_boot_device == A_BOOT_ROM ? "ROM" : "flash",
 	       a_config.a_has_ecc ? "" : "no ",
 	       a_config.a_l2_cache == A_CACHE_PARITY ? "parity" :
 	       a_config.a_l2_cache == A_CACHE_NO_PARITY ? "no-parity" : "no");
 	maa.mb_bt = &pmppc_mem_tag;
 	maa.mb_name = "cpu";
 	maa.mb_addr = MAINBUSCF_ADDR_DEFAULT;
 	maa.mb_irq = MAINBUSCF_IRQ_DEFAULT;
 	config_found(self, &maa, mainbus_print);
 	if (a_config.a_has_rtc) {
 		maa.mb_name = "rtc";
 		maa.mb_addr = PMPPC_RTC;
 		maa.mb_irq = PMPPC_I_RTC_INT;
 		config_found_sm_loc(self, "mainbus", NULL, &maa, mainbus_print,
 				    mainbus_submatch);
+	}
 	if (a_config.a_has_eth) {
 		maa.mb_name = "cs";
 		maa.mb_addr = PMPPC_CS_IO_BASE;
 		maa.mb_irq = PMPPC_I_ETH_INT;
 		config_found_sm_loc(self, "mainbus", NULL, &maa, mainbus_print,
 				    mainbus_submatch);
 		maa.mb_bt = &pmppc_mem_tag;
+	}
 	if (a_config.a_flash_width != 0) {
 		maa.mb_name = "flash";
 		maa.mb_addr = PMPPC_FLASH_BASE;
 		maa.mb_irq = MAINBUSCF_IRQ_DEFAULT;
 		maa.u.mb_flash.size = a_config.a_flash_size;
 		maa.u.mb_flash.width = a_config.a_flash_width;
 		config_found_sm_loc(self, "mainbus", NULL, &maa, mainbus_print,
 				    mainbus_submatch);
+	}
 	maa.mb_name = "cpc";
 	maa.mb_addr = MAINBUSCF_ADDR_DEFAULT;
 	maa.mb_irq = MAINBUSCF_IRQ_DEFAULT;
 	config_found(self, &maa, mainbus_print);
+}
-static int	cpu_match(struct device *, struct cfdata *, void *);
+static int	cpu_match(device_t, cfdata_t, void *);
-static void	cpu_attach(struct device *, struct device *, void *);
+static void	cpu_attach(device_t, device_t, void *);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
     cpu_match, cpu_attach, NULL, NULL);
 extern struct cfdriver cpu_cd;
 int
-cpu_match(struct device *parent, struct cfdata *cf, void *aux)
+cpu_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *maa = aux;
 	if (strcmp(maa->mb_name, cpu_cd.cd_name) != 0)
 		return 0;
 	if (cpu_info[0].ci_dev != NULL)
 		return 0;
 	return 1;
+}
 void
-cpu_attach(struct device *parent, struct device *self, void *aux)
+cpu_attach(device_t parent, device_t self, void *aux)
+{
 	(void) cpu_attach_common(self, 0);
+}

 @@ -1,93 +1,93 @@
-/* $NetBSD: mainbus.c,v 1.8 2009/03/14 21:04:11 dsl Exp $ */
+/* $NetBSD: mainbus.c,v 1.9 2011/06/05 17:03:18 matt Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2009/03/14 21:04:11 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.9 2011/06/05 17:03:18 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/cpu.h>
 #include <machine/autoconf.h>
 static struct mainbus_attach_args devs[] = {
 	{ "clock",  0x45000000, -1 },	/* Mostek/Dallas TimeKeeper */
 	{ "le",	    0xf1000000, 3 },	/* Am7990 */
 	{ "sio",    0x51000000, 6 },	/* uPD7201A */
 	{ "fb",	    0xc1100000, -1 },	/* BrookTree RAMDAC */
 	{ "spc",    0xe1000000, 2 },	/* MB89352 */
 #if 0
 	{ "spc",    0xe1000040, 2 },	/* ditto */
 #endif
 };
-static void mainbus_attach(struct device *, struct device *, void *);
+static void mainbus_attach(device_t, device_t, void *);
-static int  mainbus_match(struct device *, struct cfdata *, void *);
+static int  mainbus_match(device_t, cfdata_t, void *);
 static int  mainbus_print(void *, const char *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 static int
-mainbus_match(struct device *parent, struct cfdata *cf, void *args)
+mainbus_match(device_t parent, cfdata_t cf, void *args)
+{
 	static int mainbus_matched;
 	if (mainbus_matched)
 		return (0);
 	return ((mainbus_matched = 1));
+}
 static void
-mainbus_attach(struct device *parent, struct device *self, void *args)
+mainbus_attach(device_t parent, device_t self, void *args)
+{
 	int i;
 	if (machtype == LUNA_II)
 		devs[1].ma_addr = 0xf0000000;
 	printf("\n");
 	for (i = 0; i < sizeof(devs)/sizeof(devs[0]); i++)
 		config_found(self, (void *)&devs[i], mainbus_print);
+}
 static int
 mainbus_print(void *aux, const char *pnp)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (pnp)
 		aprint_normal("%s at %s", ma->ma_name, pnp);
 	return (UNCONF);
+}

 @@ -1,105 +1,105 @@
-/*	$NetBSD: mainbus.c,v 1.20 2008/04/28 20:23:27 martin Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.21 2011/06/05 17:03:18 matt Exp $	*/
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2011/06/05 17:03:18 matt Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #define _M68K_BUS_DMA_PRIVATE
 #include <machine/autoconf.h>
-static int	mainbus_match(struct device *, struct cfdata *, void *);
+static int	mainbus_match(device_t, cfdata_t, void *);
-static void	mainbus_attach(struct device *, struct device *, void *);
+static void	mainbus_attach(device_t, device_t, void *);
-static int	mainbus_search(struct device *, struct cfdata *,
+static int	mainbus_search(device_t, cfdata_t,
 			       const int *ldesc, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 struct m68k_bus_dma_tag mac68k_bus_dma_tag = {
 	NULL,					/* _cookie */
 ,					/* _boundary */
 	_bus_dmamap_create,			/* _dmamap_create */
 	_bus_dmamap_destroy,			/* _dmamap_destroy */
 	_bus_dmamap_load_direct,		/* _dmamap_load */
 	_bus_dmamap_load_mbuf_direct,		/* _dmamap_load_mbuf */
 	_bus_dmamap_load_uio_direct,		/* _dmamap_load_uio */
 	_bus_dmamap_load_raw_direct,		/* _dmamap_load_raw */
 	_bus_dmamap_unload,			/* _dmamap_unload */
 	_bus_dmamap_sync,			/* _dmamap_sync */
 	_bus_dmamem_alloc,			/* _dmamem_alloc */
 	_bus_dmamem_free,			/* _dmamem_free */
 	_bus_dmamem_map,			/* _dmamem_map */
 	_bus_dmamem_unmap,			/* _dmamem_unmap */
 	_bus_dmamem_mmap			/* _dmamem_mmap */
 };
 static int
-mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	static int mainbus_matched = 0;
 	/* Allow only one instance. */
 	if (mainbus_matched)
 		return (0);
 	mainbus_matched = 1;
 	return 1;
+}
 static void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args	mba;
 	printf("\n");
 	mba.mba_bst = MAC68K_BUS_SPACE_MEM;
 	mba.mba_dmat = &mac68k_bus_dma_tag;
 	/* Search for and attach children. */
 	config_search_ia(mainbus_search, self, "mainbus", &mba);
+}
 static int
-mainbus_search(struct device *parent, struct cfdata *cf,
+mainbus_search(device_t parent, cfdata_t cf,
 	       const int *ldesc, void *aux)
+{
 	if (config_match(parent, cf, aux) > 0)
 		config_attach(parent, cf, aux, NULL);
 	return 0;
+}

 @@ -1,333 +1,333 @@
-/*	$NetBSD: cpu.c,v 1.55 2011/06/05 16:52:24 matt Exp $	*/
+/*	$NetBSD: cpu.c,v 1.56 2011/06/05 17:03:16 matt Exp $	*/
 /*-
  * Copyright (c) 2001 Tsubai Masanari.
  * Copyright (c) 1998, 1999, 2001 Internet Research Institute, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by
  *	Internet Research Institute, Inc.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.55 2011/06/05 16:52:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.56 2011/06/05 17:03:16 matt Exp $");
 #include "opt_ppcparam.h"
 #include "opt_multiprocessor.h"
 #include "opt_interrupt.h"
 #include "opt_altivec.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/types.h>
 #include <sys/lwp.h>
 #include <dev/ofw/openfirm.h>
 #include <powerpc/oea/hid.h>
 #include <powerpc/oea/bat.h>
 #include <powerpc/openpic.h>
 #include <powerpc/spr.h>
 #include <powerpc/oea/spr.h>
 #ifdef ALTIVEC
 #include <powerpc/altivec.h>
 #endif
 #ifdef MULTIPROCESSOR
 #include <arch/powerpc/pic/picvar.h>
 #include <arch/powerpc/pic/ipivar.h>
 #endif
 #include <machine/autoconf.h>
 #include <machine/fpu.h>
 #include <machine/pcb.h>
 #include <machine/pio.h>
 #include <machine/trap.h>
 #include "pic_openpic.h"
 #ifndef OPENPIC
 #if NPIC_OPENPIC > 0
 #define OPENPIC
 #endif /* NOPENPIC > 0 */
 #endif /* OPENPIC */
-int cpumatch(struct device *, struct cfdata *, void *);
+int cpumatch(device_t, cfdata_t, void *);
-void cpuattach(struct device *, struct device *, void *);
+void cpuattach(device_t, device_t, void *);
 void identifycpu(char *);
 static void ohare_init(void);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
     cpumatch, cpuattach, NULL, NULL);
 extern struct cfdriver cpu_cd;
 #define HH_INTR_SECONDARY	0xf80000c0
 #define HH_ARBCONF		0xf8000090
 extern uint32_t ticks_per_intr;
 #ifdef OPENPIC
 extern void openpic_set_priority(int, int);
 #endif
 int
-cpumatch(struct device *parent, struct cfdata *cf, void *aux)
+cpumatch(device_t parent, cfdata_t cf, void *aux)
+{
 	struct confargs *ca = aux;
 	int *reg = ca->ca_reg;
 	int node;
 	if (strcmp(ca->ca_name, cpu_cd.cd_name) != 0)
 		return 0;
 	node = OF_finddevice("/cpus");
 	if (node != -1) {
 		for (node = OF_child(node); node != 0; node = OF_peer(node)) {
 			uint32_t cpunum;
 			int l;
 			l = OF_getprop(node, "reg", &cpunum, sizeof(cpunum));
 			if (l == 4 && reg[0] == cpunum)
 				return 1;
+		}
+	}
 	switch (reg[0]) {
 	case 0:	/* primary CPU */
 		return 1;
 	case 1:	/* secondary CPU */
 		if (OF_finddevice("/hammerhead") != -1)
 			if (in32rb(HH_ARBCONF) & 0x02)
 				return 1;
 		break;
+	}
 	return 0;
+}
-void cpu_OFgetspeed(struct device *, struct cpu_info *);
+void cpu_OFgetspeed(device_t, struct cpu_info *);
 void
-cpu_OFgetspeed(struct device *self, struct cpu_info *ci)
+cpu_OFgetspeed(device_t self, struct cpu_info *ci)
+{
 	int	node;
 	node = OF_finddevice("/cpus");
 	if (node != -1) {
 		for (node = OF_child(node); node; node = OF_peer(node)) {
 			uint32_t cpunum;
 			int l;
 			l = OF_getprop(node, "reg", &cpunum, sizeof(cpunum));
 			if (l == 4 && ci->ci_cpuid == cpunum) {
 				uint32_t cf;
 				l = OF_getprop(node, "clock-frequency",
 						&cf, sizeof(cf));
 				if (l == 4)
 					ci->ci_khz = cf / 1000;
 				break;
+			}
+		}
+	}
+}
 void
-cpuattach(struct device *parent, struct device *self, void *aux)
+cpuattach(device_t parent, device_t self, void *aux)
+{
 	struct cpu_info *ci;
 	struct confargs *ca = aux;
 	int id = ca->ca_reg[0];
 	ci = cpu_attach_common(self, id);
 	if (ci == NULL)
 		return;
 	if (ci->ci_khz == 0) {
 		cpu_OFgetspeed(self, ci);
+	}
 	if (id > 0) {
 #ifdef MULTIPROCESSOR
 		cpu_spinup(self, ci);
 #endif
 		return;
+	}
 	if (OF_finddevice("/bandit/ohare") != -1) {
 		printf("%s", self->dv_xname);
 		ohare_init();
+	}
+}
 #define CACHE_REG 0xf8000000
 void
 ohare_init(void)
+{
 	volatile uint32_t *cache_reg, x;
 	/* enable L2 cache */
 	cache_reg = mapiodev(CACHE_REG, PAGE_SIZE);
 	if (((cache_reg[2] >> 24) & 0x0f) >= 3) {
 		x = cache_reg[4];
 		if ((x & 0x10) == 0)
                 	x |= 0x04000000;
 		else
                 	x |= 0x04000020;
 		cache_reg[4] = x;
 		printf(": ohare L2 cache enabled\n");
+	}
+}
 #ifdef MULTIPROCESSOR
 int
 md_setup_trampoline(volatile struct cpu_hatch_data *h, struct cpu_info *ci)
+{
 #ifdef OPENPIC
 	if (openpic_base) {
 		uint32_t kl_base = 0x80000000;	/* XXX */
 		uint32_t gpio = kl_base + 0x5c;	/* XXX */
 		u_int node, off;
 		char cpupath[32];
 		/* construct an absolute branch instruction */
 		*(u_int *)EXC_RST =		/* ba cpu_spinup_trampoline */
 x48000002 | (u_int)cpu_spinup_trampoline;
 		__syncicache((void *)EXC_RST, 0x100);
 		h->running = -1;
 		/* see if there's an OF property for the reset register */
 		sprintf(cpupath, "/cpus/@%x", ci->ci_cpuid);
 		node = OF_finddevice(cpupath);
 		if (node == -1) {
 			printf(": no OF node for CPU %d?\n", ci->ci_cpuid);
 			return -1;
+		}
 		if (OF_getprop(node, "soft-reset", &off, 4) == 4) {
 			gpio = kl_base + off;
+		}
 		/* Start secondary CPU. */
 #if 1
 		out8(gpio, 4);
 		out8(gpio, 0);
 #else
 		openpic_write(OPENPIC_PROC_INIT, (1 << 1));
 #endif
 	} else {
 #endif /* OPENPIC */
 		/* Start secondary CPU and stop timebase. */
 		out32(0xf2800000, (int)cpu_spinup_trampoline);
 		cpu_send_ipi(1, IPI_NOMESG);
 #ifdef OPENPIC
+	}
 #endif
 	return 1;
+}
 void
 md_presync_timebase(volatile struct cpu_hatch_data *h)
+{
 #ifdef OPENPIC
 	if (openpic_base) {
 		uint64_t tb;
 		/* Sync timebase. */
 		tb = mftb();
 		tb += 100000;  /* 3ms @ 33MHz */
 		h->tbu = tb >> 32;
 		h->tbl = tb & 0xffffffff;
 		while (tb > mftb())
+			;
 		__asm volatile ("sync; isync");
 		h->running = 0;
 		delay(500000);
 	} else
 #endif /* OPENPIC */
+	{
 		/* sync timebase (XXX shouldn't be zero'ed) */
 		__asm volatile ("mttbl %0; mttbu %0; mttbl %0" :: "r"(0));
+	}
+}
 void
 md_start_timebase(volatile struct cpu_hatch_data *h)
+{
 	int i;
 #ifdef OPENPIC
 	if (!openpic_base) {
 #endif
 		/*
 		 * wait for secondary spin up (1.5ms @ 604/200MHz)
 		 * XXX we cannot use delay() here because timebase is not
 		 * running.
 		 */
 		for (i = 0; i < 100000; i++)
 			if (h->running)
 				break;
 		/* Start timebase. */
 		out32(0xf2800000, 0x100);
 		cpu_send_ipi(1, IPI_NOMESG);
 #ifdef OPENPIC
+	}
 #endif
+}
 void
 md_sync_timebase(volatile struct cpu_hatch_data *h)
+{
 #ifdef OPENPIC
 	if (openpic_base) {
 		/* Sync timebase. */
 		u_int tbu = h->tbu;
 		u_int tbl = h->tbl;
 		while (h->running == -1)
+			;
 		__asm volatile ("sync; isync");
 		__asm volatile ("mttbl %0" :: "r"(0));
 		__asm volatile ("mttbu %0" :: "r"(tbu));
 		__asm volatile ("mttbl %0" :: "r"(tbl));
+	}
 #endif
+}
 void
 md_setup_interrupts(void)
+{
 #ifdef OPENPIC
 	if (openpic_base)
 		openpic_set_priority(cpu_number(), 0);
 	else
 #endif /* OPENPIC */
 		out32(HH_INTR_SECONDARY, ~0);	/* Reset interrupt. */
+}
 #endif /* MULTIPROCESSOR */

 @@ -1,109 +1,109 @@
-/*	$NetBSD: mainbus.c,v 1.20 2009/03/14 21:04:12 dsl Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.21 2011/06/05 17:03:16 matt Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by Christopher G. Demetriou
  *	for the NetBSD Project.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20 2009/03/14 21:04:12 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2011/06/05 17:03:16 matt Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <dev/ofw/openfirm.h>
 #include <machine/autoconf.h>
 #include <powerpc/pic/picvar.h>
-int	mainbus_match(struct device *, struct cfdata *, void *);
+int	mainbus_match(device_t, cfdata_t, void *);
-void	mainbus_attach(struct device *, struct device *, void *);
+void	mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 /*
  * Probe for the mainbus; always succeeds.
  */
 int
-mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 /*
  * Attach the mainbus.
  */
 void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct ofbus_attach_args oba;
 	struct confargs ca;
 	int node, i;
 	u_int32_t reg[4];
 	char name[32];
 	printf("\n");
 	for (i = 0; i < 2; i++) {
 		ca.ca_name = "cpu";
 		ca.ca_reg = reg;
 		reg[0] = i;
 		config_found(self, &ca, NULL);
+	}
 	pic_finish_setup();
 	node = OF_peer(0);
 	if (node) {
 		oba.oba_busname = "ofw";
 		oba.oba_phandle = node;
 		config_found(self, &oba, NULL);
+	}
 	for (node = OF_child(OF_finddevice("/")); node; node = OF_peer(node)) {
 		memset(name, 0, sizeof(name));
 		if (OF_getprop(node, "name", name, sizeof(name)) == -1)
 			continue;
 		ca.ca_name = name;
 		ca.ca_node = node;
 		ca.ca_nreg = OF_getprop(node, "reg", reg, sizeof(reg));
 		ca.ca_reg  = reg;
 		config_found(self, &ca, NULL);
+	}
 #ifdef MAMBO
 	ca.ca_name="com";
 	config_found(self, &ca, NULL);
 #endif
+}

 @@ -1,112 +1,112 @@
-/*	$NetBSD: mainbus.c,v 1.8 2011/02/19 10:46:29 kiyohara Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.9 2011/06/05 17:03:18 matt Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2011/02/19 10:46:29 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.9 2011/06/05 17:03:18 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include "locators.h"
-static int mainbus_match(device_t, struct cfdata *, void *);
+static int mainbus_match(device_t, cfdata_t, void *);
 static void mainbus_attach(device_t, device_t, void *);
 static int mainbus_search(device_t, cfdata_t, const int *, void *);
 static int mainbus_print(void *, const char *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 static int
-mainbus_match(device_t parent, struct cfdata *cf, void *aux)
+mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 static void
 mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args maa;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	maa.ma_addr1 = MAINBUSCF_ADDR1_DEFAULT;
 	maa.ma_irq1 = MAINBUSCF_IRQ1_DEFAULT;
 	/* CPU and SHBus */
 	maa.ma_name = "cpu";
 	config_found_ia(self, "mainbus", &maa, mainbus_print);
 	maa.ma_name = "shb";
 	config_found_ia(self, "mainbus", &maa, mainbus_print);
 	/* Devices */
 	config_search_ia(mainbus_search, self, "mainbus", 0);
+}
 static int
 mainbus_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct mainbus_attach_args maa;
 	if (strcmp(cf->cf_name, "cpu") == 0 ||
 	    strcmp(cf->cf_name, "shb") == 0)
 		return 0;
 	maa.ma_name = cf->cf_name;
 	maa.ma_addr1 = cf->cf_loc[MAINBUSCF_ADDR1];
 	maa.ma_addr2 = cf->cf_loc[MAINBUSCF_ADDR2];
 	maa.ma_irq1 = cf->cf_loc[MAINBUSCF_IRQ1];
 	maa.ma_irq2 = cf->cf_loc[MAINBUSCF_IRQ2];
 	if (config_match(parent, cf, &maa))
 		config_attach(parent, cf, &maa, mainbus_print);
 	return 0;
+}
 static int
 mainbus_print(void *aux, const char *pnp)
+{
 	struct mainbus_attach_args *maa = aux;
 	if (maa->ma_addr1 != MAINBUSCF_ADDR1_DEFAULT) {
 		aprint_normal(" addr 0x%lx", maa->ma_addr1);
 		if (maa->ma_addr2 != MAINBUSCF_ADDR2_DEFAULT)
 			aprint_normal(",0x%lx", maa->ma_addr2);
+	}
 	if (maa->ma_irq1 != MAINBUSCF_IRQ1_DEFAULT) {
 		aprint_normal(" irq %d", maa->ma_irq1);
 		if (maa->ma_irq2 != MAINBUSCF_IRQ2_DEFAULT)
 			aprint_normal(",%d", maa->ma_irq2);
+	}
 	return pnp ? QUIET : UNCONF;
+}

 @@ -1,251 +1,251 @@
-/*	$NetBSD: mainbus.c,v 1.20 2008/04/28 20:23:29 martin Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.21 2011/06/05 17:03:19 matt Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Steve C. Woodford
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Derived from the mainbus code in mvme68k/autoconf.c by Chuck Cranor.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20 2008/04/28 20:23:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2011/06/05 17:03:19 matt Exp $");
 #include "vmetwo.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #define _MVME68K_BUS_DMA_PRIVATE
 #define _MVME68K_BUS_SPACE_PRIVATE
 #include <machine/bus.h>
 #undef _MVME68K_BUS_DMA_PRIVATE
 #undef _MVME68K_BUS_SPACE_PRIVATE
 #include <machine/cpu.h>
 #include <mvme68k/dev/mainbus.h>
 #if defined(MVME162) || defined(MVME172) || defined(MVME167) || defined(MVME177)
 #if NVMETWO == 0
 #include <dev/vme/vmevar.h>
 #include <dev/mvme/mvmebus.h>
 #include <dev/mvme/vme_twovar.h>
 #endif
 #endif
-void mainbus_attach(struct device *, struct device *, void *);
+void mainbus_attach(device_t, device_t, void *);
-int mainbus_match(struct device *, struct cfdata *, void *);
+int mainbus_match(device_t, cfdata_t, void *);
 int mainbus_print(void *, const char *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 struct mainbus_devices {
 	const char *md_name;
 	bus_addr_t md_offset;
 };
 #ifdef MVME147
 static struct mainbus_devices mainbusdevs_147[] = {
 	{"pcc", MAINBUS_PCC_OFFSET},
 	{"timekeeper", MAINBUS_TK147_OFFSET},
 	{NULL, 0}
 };
 #endif
 #if defined(MVME162) || defined(MVME167) || defined(MVME172) || defined(MVME177)
 static struct mainbus_devices mainbusdevs_1x7[] = {
 	{"pcctwo", MAINBUS_PCCTWO_OFFSET},
 	{"vmetwo", MAINBUS_VMETWO_OFFSET},
 	{"timekeeper", MAINBUS_TIMEKEEPER_OFFSET},
 	{NULL, 0}
 };
 #endif
 struct mvme68k_bus_dma_tag _mainbus_dma_tag = {
 	NULL,
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load_direct,
 	_bus_dmamap_load_mbuf_direct,
 	_bus_dmamap_load_uio_direct,
 	_bus_dmamap_load_raw_direct,
 	_bus_dmamap_unload,
 	NULL,			/* Set up at run-time */
 	_bus_dmamem_alloc,
 	_bus_dmamem_free,
 	_bus_dmamem_map,
 	_bus_dmamem_unmap,
 	_bus_dmamem_mmap
 };
 struct mvme68k_bus_space_tag _mainbus_space_tag = {
 	NULL,
 	_bus_space_map,
 	_bus_space_unmap,
 	_bus_space_peek_1,
 	_bus_space_peek_2,
 	_bus_space_peek_4,
 	_bus_space_poke_1,
 	_bus_space_poke_2,
 	_bus_space_poke_4
 };
 /* ARGSUSED */
 int
-mainbus_match(struct device *parent, struct cfdata *cf, void *args)
+mainbus_match(device_t parent, cfdata_t cf, void *args)
+{
 	static int mainbus_matched;
 	if (mainbus_matched)
 		return 0;
 	return (mainbus_matched = 1);
+}
 /* ARGSUSED */
 void
-mainbus_attach(struct device *parent, struct device *self, void *args)
+mainbus_attach(device_t parent, device_t self, void *args)
+{
 	struct mainbus_attach_args ma;
 	struct mainbus_devices *devices;
 	int i;
 	printf("\n");
 	/*
 	 * Attach children appropriate for this CPU.
 	 */
 	switch (machineid) {
 #ifdef MVME147
 	case MVME_147:
 		devices = mainbusdevs_147;
 		_mainbus_dma_tag._dmamap_sync = _bus_dmamap_sync_030;
 		break;
 #endif
 #if defined(MVME162) || defined(MVME167) || defined(MVME172) || defined(MVME177)
 	case MVME_162:
 	case MVME_167:
 	case MVME_172:
 	case MVME_177:
 		devices = mainbusdevs_1x7;
 		_mainbus_dma_tag._dmamap_sync = _bus_dmamap_sync_0460;
 		break;
 #endif
 	default:
 		panic("mainbus_attach: impossible CPU type");
+	}
 	for (i = 0; devices[i].md_name != NULL; ++i) {
 		/*
 		 * On mvme162 and up, if the kernel config file had no vmetwo0
 		 * device, we have to do some manual initialisation on the
 		 * VMEChip2 to get local interrupts working (ABORT switch,
 		 * hardware assisted soft interrupts).
 		 */
 #if defined(MVME162) || defined(MVME172) || defined(MVME167) || defined(MVME177)
 #if NVMETWO == 0
 		if (devices[i].md_offset == MAINBUS_VMETWO_OFFSET
 #if defined(MVME147)
 		    && machineid != MVME_147
 #endif
 		    ) {
 			(void)vmetwo_probe(&_mainbus_space_tag,
 			    intiobase_phys + MAINBUS_VMETWO_OFFSET);
 			continue;
+		}
 #endif
 #endif
 		ma.ma_name = devices[i].md_name;
 		ma.ma_dmat = &_mainbus_dma_tag;
 		ma.ma_bust = &_mainbus_space_tag;
 		ma.ma_offset = devices[i].md_offset + intiobase_phys;
 		(void)config_found(self, &ma, mainbus_print);
+	}
 	/*
 	 * Attach the memory controllers on mvme162->mvme177.
 	 * Note: These *must* be attached after the PCCChip2/MCChip.
 	 * They must also be attached *after* the VMEchip2 has been
 	 * initialised (either by the driver, or the vmetwo_probe()
 	 * call above).
 	 */
 #if defined(MVME162) || defined(MVME172) || defined(MVME167) || defined(MVME177)
 #if defined(MVME147)
 	if (machineid != MVME_147)
 #endif
+	{
 		ma.ma_name = "memc";
 		ma.ma_dmat = &_mainbus_dma_tag;
 		ma.ma_bust = &_mainbus_space_tag;
 		ma.ma_offset = MAINBUS_MEMC1_OFFSET + intiobase_phys;
 		(void)config_found(self, &ma, mainbus_print);
 		ma.ma_offset = MAINBUS_MEMC2_OFFSET + intiobase_phys;
 		(void)config_found(self, &ma, mainbus_print);
+	}
 #endif
 	/*
 	 * Attach Industry Pack modules on mvme162 and mvme172
 	 */
 #if defined(MVME162) || defined(MVME172)
 #if defined(MVME147) || defined(MVME167) || defined(MVME177)
 	if (machineid == MVME_162 || machineid == MVME_172)
 #endif
+	{
 		ma.ma_name = "ipack";
 		ma.ma_dmat = &_mainbus_dma_tag;
 		ma.ma_bust = &_mainbus_space_tag;
 		ma.ma_offset = MAINBUS_IPACK_OFFSET + intiobase_phys;
 		(void)config_found(self, &ma, mainbus_print);
+	}
 #endif
+}
 int
 mainbus_print(void *aux, const char *cp)
+{
 	struct mainbus_attach_args *ma;
 	ma = aux;
 	if (cp)
 		aprint_normal("%s at %s", ma->ma_name, cp);
 	aprint_normal(" address 0x%lx", ma->ma_offset);
 	return UNCONF;
+}

 @@ -1,67 +1,67 @@
-/*	$NetBSD: cpu.c,v 1.8 2008/04/28 20:23:29 martin Exp $	*/
+/*	$NetBSD: cpu.c,v 1.9 2011/06/05 17:03:16 matt Exp $	*/
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by NONAKA Kimihiro.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.8 2008/04/28 20:23:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.9 2011/06/05 17:03:16 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/platform.h>
-int cpumatch(struct device *, struct cfdata *, void *);
+int cpumatch(device_t, cfdata_t, void *);
-void cpuattach(struct device *, struct device *, void *);
+void cpuattach(device_t, device_t, void *);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
     cpumatch, cpuattach, NULL, NULL);
 extern struct cfdriver cpu_cd;
 int
-cpumatch(struct device *parent, struct cfdata *cfdata, void *aux)
+cpumatch(device_t parent, cfdata_t cfdata, void *aux)
+{
 	if (cpu_info[0].ci_dev != NULL)
 		return (0);
 	return (1);
+}
 void
-cpuattach(struct device *parent, struct device *self, void *aux)
+cpuattach(device_t parent, device_t self, void *aux)
+{
 	cpu_attach_common(self, 0);
 	(*platform->cpu_setup)(self);
+}

 @@ -1,152 +1,152 @@
-/*	$NetBSD: mainbus.c,v 1.12 2011/05/17 17:34:51 dyoung Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.13 2011/06/05 17:03:16 matt Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by Christopher G. Demetriou
  *	for the NetBSD Project.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2011/05/17 17:34:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.13 2011/06/05 17:03:16 matt Exp $");
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include "pci.h"
 #include "opt_pci.h"
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 #include <machine/pci_machdep.h>
 #include <machine/isa_machdep.h>
-int	mainbus_match(struct device *, struct cfdata *, void *);
+int	mainbus_match(device_t, cfdata_t, void *);
-void	mainbus_attach(struct device *, struct device *, void *);
+void	mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 int	mainbus_print(void *, const char *);
 /* There can be only one */
 static int mainbus_found;
 struct powerpc_isa_chipset genppc_ict;
 struct genppc_pci_chipset *genppc_pct;
 /*
  * Probe for the mainbus; always succeeds.
  */
 int
-mainbus_match(struct device *parent, struct cfdata *match, void *aux)
+mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	if (mainbus_found)
 		return 0;
 	return 1;
+}
 /*
  * Attach the mainbus.
  */
 void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct pcibus_attach_args pba;
 #if NPCI > 0
 	struct genppc_pci_chipset_businfo *pbi;
 #endif
 #ifdef PCI_NETBSD_CONFIGURE
 	struct extent *ioext, *memext;
 #endif
 	mainbus_found = 1;
 	aprint_normal("\n");
 	/* attach cpu */
 	config_found_ia(self, "mainbus", NULL, mainbus_print);
 	/*
 	 * XXX Note also that the presence of a PCI bus should
 	 * XXX _always_ be checked, and if present the bus should be
 	 * XXX 'found'.  However, because of the structure of the code,
 	 * XXX that's not currently possible.
 	 */
 #if NPCI > 0
 	genppc_pct = malloc(sizeof(struct genppc_pci_chipset), M_DEVBUF,
 	    M_NOWAIT);
 	KASSERT(genppc_pct != NULL);
 	mvmeppc_pci_get_chipset_tag(genppc_pct);
 	pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
 	    M_DEVBUF, M_NOWAIT);
 	KASSERT(pbi != NULL);
 	pbi->pbi_properties = prop_dictionary_create();
 	KASSERT(pbi->pbi_properties != NULL);
 	SIMPLEQ_INIT(&genppc_pct->pc_pbi);
 	SIMPLEQ_INSERT_TAIL(&genppc_pct->pc_pbi, pbi, next);
 #ifdef PCI_NETBSD_CONFIGURE
 	ioext  = extent_create("pciio",  0x00008000, 0x0000ffff, M_DEVBUF,
 	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", 0x00000000, 0x0fffffff, M_DEVBUF,
 	    NULL, 0, EX_NOWAIT);
 	pci_configure_bus(0, ioext, memext, NULL, 0, 32);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
 	pba.pba_iot = &prep_io_space_tag;
 	pba.pba_memt = &prep_mem_space_tag;
 	pba.pba_dmat = &pci_bus_dma_tag;
 	pba.pba_dmat64 = NULL;
 	pba.pba_pc = genppc_pct;
 	pba.pba_bus = 0;
 	pba.pba_bridgetag = NULL;
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 	config_found_ia(self, "pcibus", &pba, pcibusprint);
 #endif
+}
 int
 mainbus_print(void *aux, const char *pnp)
+{
 	if (pnp)
 		aprint_normal("cpu at %s", pnp);
 	return (UNCONF);
+}

 @@ -1,105 +1,105 @@
-/*	$NetBSD: mainbus.c,v 1.10 2008/04/28 20:23:30 martin Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.11 2011/06/05 17:03:19 matt Exp $	*/
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2008/04/28 20:23:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2011/06/05 17:03:19 matt Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #define _M68K_BUS_DMA_PRIVATE
 #include <machine/autoconf.h>
-static int	mainbus_match(struct device *, struct cfdata *, void *);
+static int	mainbus_match(device_t, cfdata_t, void *);
-static void	mainbus_attach(struct device *, struct device *, void *);
+static void	mainbus_attach(device_t, device_t, void *);
-static int	mainbus_search(struct device *, struct cfdata *,
+static int	mainbus_search(device_t, cfdata_t,
 			       const int *, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 struct m68k_bus_dma_tag next68k_bus_dma_tag = {
 	NULL,					/* _cookie */
 ,					/* _boundary */
 	_bus_dmamap_create,			/* _dmamap_create */
 	_bus_dmamap_destroy,			/* _dmamap_destroy */
 	_bus_dmamap_load_direct,		/* _dmamap_load */
 	_bus_dmamap_load_mbuf_direct,		/* _dmamap_load_mbuf */
 	_bus_dmamap_load_uio_direct,		/* _dmamap_load_uio */
 	_bus_dmamap_load_raw_direct,		/* _dmamap_load_raw */
 	_bus_dmamap_unload,			/* _dmamap_unload */
 	_bus_dmamap_sync,			/* _dmamap_sync */
 	_bus_dmamem_alloc,			/* _dmamem_alloc */
 	_bus_dmamem_free,			/* _dmamem_free */
 	_bus_dmamem_map,			/* _dmamem_map */
 	_bus_dmamem_unmap,			/* _dmamem_unmap */
 	_bus_dmamem_mmap			/* _dmamem_mmap */
 };
 static int mainbus_attached = 0;
 static int
-mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	/* Allow only one instance. */
 	if (mainbus_attached)
 		return (0);
 	return 1;
+}
 static void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args	mba;
 	printf("\n");
 	mba.mba_dmat = &next68k_bus_dma_tag;
 	/* Search for and attach children. */
 	config_search_ia(mainbus_search, self, "mainbus", &mba);
 	mainbus_attached = 1;
+}
 static int
-mainbus_search(struct device *parent, struct cfdata *cf,
+mainbus_search(device_t parent, cfdata_t cf,
 	       const int *ldesc, void *aux)
+{
 	if (config_match(parent, cf, aux) > 0)
 		config_attach(parent, cf, aux, NULL);
 	return 0;
+}

 @@ -1,319 +1,319 @@
-/*	$NetBSD: cpu.c,v 1.14 2011/06/05 16:52:24 matt Exp $	*/
+/*	$NetBSD: cpu.c,v 1.15 2011/06/05 17:03:16 matt Exp $	*/
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by NONAKA Kimihiro; by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.14 2011/06/05 16:52:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.15 2011/06/05 17:03:16 matt Exp $");
 #include "opt_ppcparam.h"
 #include "opt_multiprocessor.h"
 #include "opt_interrupt.h"
 #include "opt_altivec.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/ofw/openfirm.h>
 #include <powerpc/openpic.h>
 #include <powerpc/spr.h>
 #include <powerpc/oea/spr.h>
 #include <powerpc/oea/hid.h>
 #include <powerpc/oea/bat.h>
 #ifdef ALTIVEC
 #include <powerpc/altivec.h>
 #endif
 #ifdef MULTIPROCESSOR
 #include <arch/powerpc/pic/picvar.h>
 #include <arch/powerpc/pic/ipivar.h>
 #include <powerpc/rtas.h>
 #endif
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
 #include <machine/fpu.h>
 #include <machine/pcb.h>
 #include <machine/pio.h>
 #include <machine/trap.h>
 #include "pic_openpic.h"
 #ifndef OPENPIC
 #if NPIC_OPENPIC > 0
 #define OPENPIC
 #endif /* NOPENPIC > 0 */
 #endif /* OPENPIC */
-static int cpu_match(struct device *, struct cfdata *, void *);
+static int cpu_match(device_t, cfdata_t, void *);
-static void cpu_attach(struct device *, struct device *, void *);
+static void cpu_attach(device_t, device_t, void *);
-void cpu_OFgetspeed(struct device *, struct cpu_info *);
+void cpu_OFgetspeed(device_t, struct cpu_info *);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
     cpu_match, cpu_attach, NULL, NULL);
 extern struct cfdriver cpu_cd;
 extern int machine_has_rtas;
 int
-cpu_match(struct device *parent, struct cfdata *cfdata, void *aux)
+cpu_match(device_t parent, cfdata_t cfdata, void *aux)
+{
 	struct confargs *ca = aux;
 	int *reg = ca->ca_reg;
 	int node;
 	if (strcmp(ca->ca_name, cpu_cd.cd_name) != 0)
 		return 0;
 	node = OF_finddevice("/cpus");
 	if (node != -1) {
 		for (node = OF_child(node); node != 0; node = OF_peer(node)) {
 			uint32_t cpunum;
 			int l;
 			l = OF_getprop(node, "reg", &cpunum, sizeof(cpunum));
 			if (l == 4 && reg[0] == cpunum)
 				return 1;
+		}
+	}
 	if (reg[0] == 0)
 		return 1;
 	return 0;
+}
 void
-cpu_OFgetspeed(struct device *self, struct cpu_info *ci)
+cpu_OFgetspeed(device_t self, struct cpu_info *ci)
+{
 	int node;
 	node = OF_finddevice("/cpus");
 	if (node != -1) {
 		for (node = OF_child(node); node; node = OF_peer(node)) {
 			uint32_t cpunum;
 			int l;
 			l = OF_getprop(node, "reg", &cpunum, sizeof(cpunum));
 			if (l == sizeof(uint32_t) && ci->ci_cpuid == cpunum) {
 				uint32_t cf;
 				l = OF_getprop(node, "clock-frequency",
 				    &cf, sizeof(cf));
 				if (l == sizeof(uint32_t))
 					ci->ci_khz = cf / 1000;
 				break;
+			}
+		}
+	}
 	if (ci->ci_khz)
 		aprint_normal_dev(self, "%u.%02u MHz\n",
 		    ci->ci_khz / 1000, (ci->ci_khz / 10) % 100);
+}
 static void
 cpu_print_cache_config(uint32_t size, uint32_t line)
+{
 	char cbuf[7];
 	format_bytes(cbuf, sizeof(cbuf), size);
 	aprint_normal("%s %dB/line", cbuf, line);
+}
 static void
 cpu_OFprintcacheinfo(int node)
+{
 	int l;
 	uint32_t dcache=0, icache=0, dline=0, iline=0;
 	OF_getprop(node, "i-cache-size", &icache, sizeof(icache));
 	OF_getprop(node, "d-cache-size", &dcache, sizeof(dcache));
 	OF_getprop(node, "i-cache-line-size", &iline, sizeof(iline));
 	OF_getprop(node, "d-cache-line-size", &dline, sizeof(dline));
 	if (OF_getprop(node, "cache-unified", &l, sizeof(l)) != -1) {
 		aprint_normal("cache ");
 		cpu_print_cache_config(icache, iline);
 	} else {
 		aprint_normal("I-cache ");
 		cpu_print_cache_config(icache, iline);
 		aprint_normal(", D-cache ");
 		cpu_print_cache_config(dcache, dline);
+	}
 	aprint_normal("\n");
+}
 static void
-cpu_OFgetcache(struct device *self, struct cpu_info *ci)
+cpu_OFgetcache(device_t self, struct cpu_info *ci)
+{
 	int node, cpu=-1;
 	char name[32];
 	node = OF_finddevice("/cpus");
 	if (node == -1)
 		return;
 	for (node = OF_child(node); node; node = OF_peer(node)) {
 		uint32_t cpunum;
 		int l;
 		l = OF_getprop(node, "reg", &cpunum, sizeof(cpunum));
 		if (l == sizeof(uint32_t) && ci->ci_cpuid == cpunum) {
 			cpu = node;
 			break;
+		}
+	}
 	if (cpu == -1)
 		return;
 	/* now we have cpu */
 	aprint_normal_dev(self, "L1 ");
 	cpu_OFprintcacheinfo(cpu);
 	for (node = OF_child(cpu); node; node = OF_peer(node)) {
 		if (OF_getprop(node, "name", name, sizeof(name)) != -1) {
 			if (strcmp("l2-cache", name) == 0) {
 				aprint_normal_dev(self, "L2 ");
 				cpu_OFprintcacheinfo(node);
 			} else if (strcmp("l3-cache", name) == 0) {
 				aprint_normal_dev(self, "L3 ");
 				cpu_OFprintcacheinfo(node);
+			}
+		}
+	}
+}
 void
-cpu_attach(struct device *parent, struct device *self, void *aux)
+cpu_attach(device_t parent, device_t self, void *aux)
+{
 	struct cpu_info *ci;
 	struct confargs *ca = aux;
 	int id = ca->ca_reg[0];
 	ci = cpu_attach_common(self, id);
 	if (ci == NULL)
 		return;
 	if (id > 0)
 #ifdef MULTIPROCESSOR
 		cpu_spinup(self, ci);
 #endif
 	if (ci->ci_khz == 0)
 		cpu_OFgetspeed(self, ci);
 	cpu_OFgetcache(self, ci);
 	return;
+}
 #ifdef MULTIPROCESSOR
 extern volatile u_int cpu_spinstart_cpunum;
 extern volatile u_int cpu_spinstart_ack;
 int
 md_setup_trampoline(volatile struct cpu_hatch_data *h, struct cpu_info *ci)
+{
 	int i;
 	u_int msr;
 	msr = mfmsr();
 	h->running = -1;
 	cpu_spinstart_cpunum = ci->ci_cpuid;
 	__asm volatile("dcbf 0,%0"::"r"(&cpu_spinstart_cpunum):"memory");
 	for (i=0; i < 100000000; i++)
 		if (cpu_spinstart_ack == 0)
 			break;
 	return 1;
+}
 void
 md_presync_timebase(volatile struct cpu_hatch_data *h)
+{
 	uint64_t tb;
 	int junk;
 	if (machine_has_rtas && rtas_has_func(RTAS_FUNC_FREEZE_TIME_BASE)) {
 		rtas_call(RTAS_FUNC_FREEZE_TIME_BASE, 0, 1, &junk);
 		/* Sync timebase. */
 		tb = mftb();
 		h->tbu = tb >> 32;
 		h->tbl = tb & 0xffffffff;
 		h->running = 0;
+	}
 	/* otherwise, the machine has no rtas, or if it does, things
 	 * are pre-syncd, per PAPR v2.2.  I don't have anything without
 	 * rtas, so if such a machine exists, someone will have to write
 	 * code for it
 	 */
+}
 void
 md_start_timebase(volatile struct cpu_hatch_data *h)
+{
 	int i, junk;
 	/*
 	 * wait for secondary spin up (1.5ms @ 604/200MHz)
 	 * XXX we cannot use delay() here because timebase is not
 	 * running.
 	 */
 	for (i = 0; i < 100000; i++)
 		if (h->running)
 			break;
 	/* Start timebase. */
 	if (machine_has_rtas && rtas_has_func(RTAS_FUNC_THAW_TIME_BASE))
 		rtas_call(RTAS_FUNC_THAW_TIME_BASE, 0, 1, &junk);
+}
 /*
  * We wait for h->running to become 0, and then we know that the time is
  * frozen and h->tb is correct.
  */
 void
 md_sync_timebase(volatile struct cpu_hatch_data *h)
+{
 	/* Sync timebase. */
 	u_int tbu = h->tbu;
 	u_int tbl = h->tbl;
 	while (h->running == -1)
+		;
 	__asm volatile ("sync; isync");
 	__asm volatile ("mttbl %0" :: "r"(0));
 	__asm volatile ("mttbu %0" :: "r"(tbu));
 	__asm volatile ("mttbl %0" :: "r"(tbl));
+}
 void
 md_setup_interrupts(void)
+{
 /* do nothing, this is handled in ofwpci */
+}
 #endif /* MULTIPROCESSOR */

 @@ -1,349 +1,349 @@
-/*	$NetBSD: mainbus.c,v 1.26 2010/06/09 04:41:42 kiyohara Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.27 2011/06/05 17:03:16 matt Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.26 2010/06/09 04:41:42 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.27 2011/06/05 17:03:16 matt Exp $");
 #include "opt_interrupt.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_pci.h>
 #include <arch/powerpc/pic/picvar.h>
 #ifdef MULTIPROCESSOR
 #include <arch/powerpc/pic/ipivar.h>
 #endif
 #include <machine/pci_machdep.h>
 #include <machine/autoconf.h>
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
-int	mainbus_match(struct device *, struct cfdata *, void *);
+int	mainbus_match(device_t, cfdata_t, void *);
-void	mainbus_attach(struct device *, struct device *, void *);
+void	mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 int mainbus_found = 0;
 struct pic_ops *isa_pic;
 #ifdef PIC_PREPIVR
 vaddr_t prep_intr_reg;
 uint32_t prep_intr_reg_off;
 #endif
 extern ofw_pic_node_t picnodes[8];
 extern int nrofpics;
 extern int primary_pic;
 #ifdef PIC_PREPIVR
 static struct pic_ops *
 init_prepivr(int node)
+{
 	int pcinode;
 	uint32_t ivr;
 	pcinode = OF_finddevice("/pci");
 	if (OF_getprop(pcinode, "8259-interrupt-acknowledge", &ivr,
 		sizeof(ivr)) != sizeof(ivr)) {
 		aprint_error("Incorrectly identified i8259 as prepivr\n");
 		return setup_i8259();
+	}
 	prep_intr_reg = (vaddr_t)mapiodev(ivr, sizeof(uint32_t));
 	prep_intr_reg_off = 0; /* hack */
 	if (!prep_intr_reg)
 		panic("startup: no room for interrupt register");
 	return setup_prepivr(PIC_IVR_MOT);
+}
 #endif
 static int
 init_openpic(int node)
+{
 	struct ofw_pci_register aadr;
 	struct ranges {
 		uint32_t pci_hi, pci_mid, pci_lo;
 		uint32_t host;
 		uint32_t size_hi, size_lo;
 	} ranges[6], *rp = ranges;
 	unsigned char *baseaddr = NULL;
 	uint32_t reg[12];
 	int parent, len;
 #ifdef PIC_DISTOPENPIC
 	unsigned char *isu[OPENPIC_MAX_ISUS];
 	int i, j;
 	int isumap[OPENPIC_MAX_ISUS];
 #endif
 	if (OF_getprop(node, "assigned-addresses", &aadr, sizeof(aadr))
 	    != sizeof(aadr))
 		goto noaadr;
 	parent = OF_parent(node);
 	len = OF_getprop(parent, "ranges", ranges, sizeof(ranges));
 	if (len == -1)
 		goto noaadr;
 #ifdef PIC_OPENPIC
 	while (len >= sizeof(ranges[0])) {
 		if ((rp->pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) ==
 		    (aadr.phys_hi & OFW_PCI_PHYS_HI_SPACEMASK) &&
 		    (aadr.size_lo + aadr.phys_lo <= (rp->size_lo+rp->host))) {
 			baseaddr = (unsigned char *)mapiodev(
 			    rp->host | aadr.phys_lo, aadr.size_lo);
 			aprint_normal("Found openpic at %08x\n",
 			    rp->host | aadr.phys_lo);
 			setup_openpic(baseaddr, 0);
 #ifdef MULTIPROCESSOR
 			setup_openpic_ipi();
 			ipiops.ppc_establish_ipi(IST_LEVEL, IPL_HIGH, NULL);
 			for (i=1; i < ncpu; i++) {
 				aprint_verbose("Enabling interrupts "
 				    "for cpu%d\n", i);
 				openpic_set_priority(i, 0);
+			}
 #endif
 			return TRUE;
+		}
 		rp++;
 		len -= sizeof(ranges[0]);
+	}
 #endif
 	rp = 0; /* satisfy -Wall */
 	return FALSE;
  noaadr:
 	/* this isn't a PCI-attached openpic */
 	len = OF_getprop(node, "reg", &reg, sizeof(reg));
 	if (len < sizeof(int)*2)
 		return FALSE;
 	if (len == sizeof(int)*2) {
 		baseaddr = (unsigned char *)mapiodev(reg[0], reg[1]);
 		aprint_verbose("Found openpic at %08x\n", reg[0]);
 #ifdef PIC_OPENPIC
 		(void)setup_openpic(baseaddr, 0);
 #ifdef MULTIPROCESSOR
 		setup_openpic_ipi();
 		ipiops.ppc_establish_ipi(IST_LEVEL, IPL_HIGH, NULL);
 		for (i=1; i < ncpu; i++) {
 			aprint_verbose("Enabling interrupts for cpu%d\n", i);
 			openpic_set_priority(i, 0);
+		}
 #endif
 		return TRUE;
 #else
 		aprint_error("No openpic support compiled into kernel!");
 		return FALSE;
 #endif
+	}
 #ifdef PIC_DISTOPENPIC
 	/* otherwise, we have a distributed openpic */
 	i = len/(sizeof(int)*2) - 1;
 	if (i == 0)
 		return FALSE;
 	if (i > OPENPIC_MAX_ISUS)
 		aprint_error("Increase OPENPIC_MAX_ISUS to %d\n", i);
 	baseaddr = (unsigned char *)mapiodev(reg[0], 0x40000);
 	aprint_verbose("Found openpic at %08x\n", reg[0]);
 	for (j=0; j < i; j++) {
 		isu[j] = (unsigned char *)mapiodev(reg[(j+1)*2],
 		    reg[(j+1)*2+1]);
 		isumap[j] = reg[(j+1)*2+1];
+	}
 	(void)setup_distributed_openpic(baseaddr, i, (void **)isu, isumap);
 #ifdef MULTIPROCESSOR
 	setup_openpic_ipi();
 	ipiops.ppc_establish_ipi(IST_LEVEL, IPL_HIGH, NULL);
 	for (i=1; i < ncpu; i++) {
 		aprint_verbose("Enabling interrupts for cpu%d\n", i);
 		openpic_set_priority(i, 0);
+	}
 #endif
 	return TRUE;
 #endif
 	aprint_error("PIC support not present or PIC error\n");
 	return FALSE;
+}
 /*
  * Probe for the mainbus; always succeeds.
  */
 int
-mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	if (mainbus_found)
 		return 0;
 	return 1;
+}
 /*
  * Attach the mainbus.
  */
 void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct ofbus_attach_args oba;
 	struct confargs ca;
 	int node, rtnode, i;
 	u_int32_t reg[4];
 	char name[32];
 	mainbus_found = 1;
 	aprint_normal("\n");
 	/* Find rtas first */
 	rtnode = OF_finddevice("/rtas");
 	if (rtnode != -1) {
 		memset(name, 0, sizeof(name));
 		if (OF_getprop(rtnode, "name", name, sizeof(name)) != -1) {
 			ca.ca_name = name;
 			ca.ca_node = rtnode;
 			ca.ca_nreg = OF_getprop(rtnode, "reg", reg,
 			    sizeof(reg));
 			ca.ca_reg  = reg;
 			config_found(self, &ca, NULL);
+		}
+	}
 	/* Now find CPU's */
 	for (i = 0; i < CPU_MAXNUM; i++) {
 		ca.ca_name = "cpu";
 		ca.ca_reg = reg;
 		reg[0] = i;
 		config_found(self, &ca, NULL);
+	}
 	node = OF_peer(0);
 	if (node) {
 		oba.oba_busname = "ofw";
 		oba.oba_phandle = node;
 		config_found(self, &oba, NULL);
+	}
 	if (strcmp(model_name, "Pegasos2") == 0) {
 		/*
 		 * Configure to System Controller MV64361.
 		 * And skip other devices.  These attached from it.
 		 */
 		ca.ca_name = "gt";
 		config_found(self, &ca, NULL);
 		goto config_fin;
+	}
 	/* this primarily searches for pci bridges on the root bus */
 	for (node = OF_child(OF_finddevice("/")); node; node = OF_peer(node)) {
 		memset(name, 0, sizeof(name));
 		if (OF_getprop(node, "name", name, sizeof(name)) == -1)
 			continue;
 		/* skip rtas */
 		if (node == rtnode)
 			continue;
 		ca.ca_name = name;
 		ca.ca_node = node;
 		ca.ca_nreg = OF_getprop(node, "reg", reg, sizeof(reg));
 		ca.ca_reg  = reg;
 		config_found(self, &ca, NULL);
+	}
 config_fin:
 	pic_finish_setup();
+}
 void
 init_interrupt(void)
+{
 	/* Do nothing, not ready yet */
+}
 void
 init_ofppc_interrupt(void)
+{
 	int node, i, isa_cascade = 0;
 	/* Now setup the PIC's */
 	node = OF_finddevice("/");
 	if (node <= 0)
 		panic("Can't find root OFW device node\n");
 	genofw_find_ofpics(node);
 	genofw_fixup_picnode_offsets();
 	pic_init();
 	/* find ISA first */
 	for (i = 0; i < nrofpics; i++) {
 		if (picnodes[i].type == PICNODE_TYPE_8259) {
 			aprint_debug("calling i8259 setup\n");
 			isa_pic = setup_i8259();
+		}
 		if (picnodes[i].type == PICNODE_TYPE_IVR) {
 			aprint_debug("calling prepivr setup\n");
 #ifdef PIC_PREPIVR
 			isa_pic = init_prepivr(picnodes[i].node);
 #else
 			isa_pic = setup_i8259();
 #endif
+		}
+	}
 	for (i = 0; i < nrofpics; i++) {
 		if (picnodes[i].type == PICNODE_TYPE_8259)
 			continue;
 		if (picnodes[i].type == PICNODE_TYPE_IVR)
 			continue;
 		if (picnodes[i].type == PICNODE_TYPE_OPENPIC) {
 			aprint_debug("calling openpic setup\n");
 			if (isa_pic != NULL)
 				isa_cascade = 1;
 			(void)init_openpic(picnodes[i].node);
 		} else
 			aprint_error("Unhandled pic node type node=%x\n",
 			    picnodes[i].node);
+	}
 	if (isa_cascade) {
 		primary_pic = 1;
 		intr_establish(16, IST_LEVEL, IPL_NONE, pic_handle_intr,
 		    isa_pic);
+	}
+}

 @@ -1,318 +1,318 @@
-/*	$NetBSD: cpu.c,v 1.28 2010/03/18 13:47:05 kiyohara Exp $	*/
+/*	$NetBSD: cpu.c,v 1.29 2011/06/05 17:03:17 matt Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed for the NetBSD Project by
  *      Wasabi Systems, Inc.
  * 4. The name of Wasabi Systems, Inc. may not be used to endorse
  *    or promote products derived from this software without specific prior
  *    written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.28 2010/03/18 13:47:05 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.29 2011/06/05 17:03:17 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/evcnt.h>
 #include <uvm/uvm_extern.h>
 #include <prop/proplib.h>
 #include <machine/cpu.h>
 #include <powerpc/ibm4xx/dev/plbvar.h>
 struct cputab {
 	u_int version;
 	u_int mask;
 	const char *name;
 };
 static struct cputab models[] = {
 	{ PVR_401A1, 	0xffff0000,	"401A1" 	},
 	{ PVR_401B2, 	0xffff0000,	"401B21" 	},
 	{ PVR_401C2, 	0xffff0000,	"401C2" 	},
 	{ PVR_401D2, 	0xffff0000,	"401D2" 	},
 	{ PVR_401E2, 	0xffff0000,	"401E2" 	},
 	{ PVR_401F2, 	0xffff0000,	"401F2" 	},
 	{ PVR_401G2, 	0xffff0000,	"401G2" 	},
 	{ PVR_403, 	0xffff0000,	"403" 		},
 	{ PVR_405GP, 	0xffff0000,	"405GP" 	},
 	{ PVR_405GPR, 	0xffff0000,	"405GPr" 	},
 	{ PVR_405D5X1, 	0xfffff000, 	"Xilinx Virtex II Pro" 	},
 	{ PVR_405D5X2, 	0xfffff000, 	"Xilinx Virtex 4 FX" 	},
 	{ PVR_405EX, 	0xffff0000, 	"405EX" 	},
 	{ 0, 		0,		NULL 		}
 };
-static int	cpumatch(struct device *, struct cfdata *, void *);
+static int	cpumatch(device_t, cfdata_t, void *);
-static void	cpuattach(struct device *, struct device *, void *);
+static void	cpuattach(device_t, device_t, void *);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
     cpumatch, cpuattach, NULL, NULL);
 int ncpus;
 struct cpu_info cpu_info[1] = {
+	{
 		/* XXX add more ci_ev_* as we teach 4xx about them */
 		.ci_ev_clock = EVCNT_INITIALIZER(EVCNT_TYPE_INTR,
 		    NULL, "cpu0", "clock"),
 		.ci_ev_statclock = EVCNT_INITIALIZER(EVCNT_TYPE_INTR,
 		    NULL, "cpu0", "stat clock"),
 		.ci_ev_softclock = EVCNT_INITIALIZER(EVCNT_TYPE_INTR,
 		    NULL, "cpu0", "soft clock"),
 		.ci_ev_softnet = EVCNT_INITIALIZER(EVCNT_TYPE_INTR,
 		    NULL, "cpu0", "soft net"),
 		.ci_ev_softserial = EVCNT_INITIALIZER(EVCNT_TYPE_INTR,
 		    NULL, "cpu0", "soft serial"),
 		.ci_curlwp = &lwp0,
+	}
 };
 char cpu_model[80];
 int cpufound = 0;
 static int
-cpumatch(struct device *parent, struct cfdata *cf, void *aux)
+cpumatch(device_t parent, cfdata_t cf, void *aux)
+{
 	struct plb_attach_args *paa = aux;
 	/* make sure that we're looking for a CPU */
 	if (strcmp(paa->plb_name, cf->cf_name) != 0)
 		return (0);
 	return !cpufound;
+}
 static void
-cpuattach(struct device *parent, struct device *self, void *aux)
+cpuattach(device_t parent, device_t self, void *aux)
+{
 	struct cputab *cp = models;
 	u_int pvr;
 	u_int processor_freq;
 	prop_number_t freq;
 	freq = prop_dictionary_get(board_properties, "processor-frequency");
 	KASSERT(freq != NULL);
 	processor_freq = (unsigned int) prop_number_integer_value(freq);
 	cpufound++;
 	ncpus++;
 	pvr = mfpvr();
 	while (cp->name) {
 		if ((pvr & cp->mask) == cp->version)
 			break;
 		cp++;
+	}
 	if (cp->name)
 		strcpy(cpu_model, cp->name);
 	else
 		sprintf(cpu_model, "Version 0x%x", pvr);
 	printf(": %dMHz %s (PVR 0x%x)\n", processor_freq / 1000 / 1000,
 	    cp->name ? cp->name : "unknown model", pvr);
 	cpu_probe_cache();
 	/* We would crash later on anyway so just make the reason obvious */
 	if (curcpu()->ci_ci.icache_size == 0 &&
 	    curcpu()->ci_ci.dcache_size == 0)
 		panic("%s could not detect cache size", device_xname(self));
 	printf("%s: Instruction cache size %d line size %d\n",
 	    device_xname(self),
 	    curcpu()->ci_ci.icache_size, curcpu()->ci_ci.icache_line_size);
 	printf("%s: Data cache size %d line size %d\n",
 	    device_xname(self),
 	    curcpu()->ci_ci.dcache_size, curcpu()->ci_ci.dcache_line_size);
+}
 /*
  * This routine must be explicitly called to initialize the
  * CPU cache information so cache flushe and memcpy operation
  * work.
  */
 void
 cpu_probe_cache(void)
+{
 	struct cputab *cp = models;
 	u_int pvr;
 	pvr = mfpvr();
 	while (cp->name) {
 		if ((pvr & cp->mask) == cp->version)
 			break;
 		cp++;
+	}
 	/*
 	 * First we need to identify the CPU and determine the
 	 * cache line size, or things like memset/memcpy may lose
 	 * badly.
 	 */
 	switch (cp->version) {
 	case PVR_401A1:
 		curcpu()->ci_ci.dcache_size = 1024;
 		curcpu()->ci_ci.dcache_line_size = 16;
 		curcpu()->ci_ci.icache_size = 2848;
 		curcpu()->ci_ci.icache_line_size = 16;
 		break;
 	case PVR_401B2:
 		curcpu()->ci_ci.dcache_size = 8192;
 		curcpu()->ci_ci.dcache_line_size = 16;
 		curcpu()->ci_ci.icache_size = 16384;
 		curcpu()->ci_ci.icache_line_size = 16;
 		break;
 	case PVR_401C2:
 		curcpu()->ci_ci.dcache_size = 8192;
 		curcpu()->ci_ci.dcache_line_size = 16;
 		curcpu()->ci_ci.icache_size = 0;
 		curcpu()->ci_ci.icache_line_size = 16;
 		break;
 	case PVR_401D2:
 		curcpu()->ci_ci.dcache_size = 2848;
 		curcpu()->ci_ci.dcache_line_size = 16;
 		curcpu()->ci_ci.icache_size = 4096;
 		curcpu()->ci_ci.icache_line_size = 16;
 		break;
 	case PVR_401E2:
 		curcpu()->ci_ci.dcache_size = 0;
 		curcpu()->ci_ci.dcache_line_size = 16;
 		curcpu()->ci_ci.icache_size = 0;
 		curcpu()->ci_ci.icache_line_size = 16;
 		break;
 	case PVR_401F2:
 		curcpu()->ci_ci.dcache_size = 2048;
 		curcpu()->ci_ci.dcache_line_size = 16;
 		curcpu()->ci_ci.icache_size = 2848;
 		curcpu()->ci_ci.icache_line_size = 16;
 		break;
 	case PVR_401G2:
 		curcpu()->ci_ci.dcache_size = 2848;
 		curcpu()->ci_ci.dcache_line_size = 16;
 		curcpu()->ci_ci.icache_size = 8192;
 		curcpu()->ci_ci.icache_line_size = 16;
 		break;
 	case PVR_403:
 		curcpu()->ci_ci.dcache_size = 8192;
 		curcpu()->ci_ci.dcache_line_size = 16;
 		curcpu()->ci_ci.icache_size = 16384;
 		curcpu()->ci_ci.icache_line_size = 16;
 		break;
 	case PVR_405GP:
 		curcpu()->ci_ci.dcache_size = 8192;
 		curcpu()->ci_ci.dcache_line_size = 32;
 		curcpu()->ci_ci.icache_size = 8192;
 		curcpu()->ci_ci.icache_line_size = 32;
 		break;
 	case PVR_405GPR:
 	case PVR_405D5X1:
 	case PVR_405D5X2:
 	case PVR_405EX:
 		curcpu()->ci_ci.dcache_size = 16384;
 		curcpu()->ci_ci.dcache_line_size = 32;
 		curcpu()->ci_ci.icache_size = 16384;
 		curcpu()->ci_ci.icache_line_size = 32;
 		break;
 	default:
 		/*
 		 * Unknown CPU type.  For safety we'll specify a
 		 * cache with a 4-byte line size.  That way cache
 		 * flush routines won't miss any lines.
 		 */
 		curcpu()->ci_ci.dcache_line_size = 4;
 		curcpu()->ci_ci.icache_line_size = 4;
 		break;
+	}
+}
 /*
  * These small routines may have to be replaced,
  * if/when we support processors other that the 604.
  */
 void
 dcache_flush_page(vaddr_t va)
+{
 	int i;
 	if (curcpu()->ci_ci.dcache_line_size)
 		for (i = 0; i < PAGE_SIZE;
 		     i += curcpu()->ci_ci.dcache_line_size)
 			__asm volatile("dcbf %0,%1" : : "r" (va), "r" (i));
 	__asm volatile("sync;isync" : : );
+}
 void
 icache_flush_page(vaddr_t va)
+{
 	int i;
 	if (curcpu()->ci_ci.icache_line_size)
 		for (i = 0; i < PAGE_SIZE;
 		     i += curcpu()->ci_ci.icache_line_size)
 			__asm volatile("icbi %0,%1" : : "r" (va), "r" (i));
 	__asm volatile("sync;isync" : : );
+}
 void
 dcache_flush(vaddr_t va, vsize_t len)
+{
 	int i;
 	if (len == 0)
 		return;
 	/* Make sure we flush all cache lines */
 	len += va & (curcpu()->ci_ci.dcache_line_size-1);
 	if (curcpu()->ci_ci.dcache_line_size)
 		for (i = 0; i < len; i += curcpu()->ci_ci.dcache_line_size)
 			__asm volatile("dcbf %0,%1" : : "r" (va), "r" (i));
 	__asm volatile("sync;isync" : : );
+}
 void
 icache_flush(vaddr_t va, vsize_t len)
+{
 	int i;
 	if (len == 0)
 		return;
 	/* Make sure we flush all cache lines */
 	len += va & (curcpu()->ci_ci.icache_line_size-1);
 	if (curcpu()->ci_ci.icache_line_size)
 		for (i = 0; i < len; i += curcpu()->ci_ci.icache_line_size)
 			__asm volatile("icbi %0,%1" : : "r" (va), "r" (i));
 	__asm volatile("sync;isync" : : );
+}

 @@ -1,166 +1,166 @@
-/*	$NetBSD: cpu.c,v 1.15 2008/04/28 20:23:33 martin Exp $	*/
+/*	$NetBSD: cpu.c,v 1.16 2011/06/05 17:03:17 matt Exp $	*/
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by NONAKA Kimihiro.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.15 2008/04/28 20:23:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.16 2011/06/05 17:03:17 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/platform.h>
 #ifdef MULTIPROCESSOR
 #include <arch/powerpc/pic/picvar.h>
 #include <arch/powerpc/pic/ipivar.h>
 #include <powerpc/openpic.h>
 #include <powerpc/trap.h>
 extern void openpic_set_priority(int, int);
 #endif
-int cpumatch(struct device *, struct cfdata *, void *);
+int cpumatch(device_t, cfdata_t, void *);
-void cpuattach(struct device *, struct device *, void *);
+void cpuattach(device_t, device_t, void *);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
     cpumatch, cpuattach, NULL, NULL);
 extern struct cfdriver cpu_cd;
 int
-cpumatch(struct device *parent, struct cfdata *cfdata, void *aux)
+cpumatch(device_t parent, cfdata_t cfdata, void *aux)
+{
 	struct confargs *ca = aux;
 	if (strcmp(ca->ca_name, cpu_cd.cd_name) != 0)
 		return (0);
 #if 0
 	if (cpu_info[0].ci_dev != NULL)
 		return (0);
 #endif
 	return (1);
+}
 void
-cpuattach(struct device *parent, struct device *self, void *aux)
+cpuattach(device_t parent, device_t self, void *aux)
+{
 	struct cpu_info *ci;
 	struct confargs *ca = aux;
 	int id = ca->ca_node;
 	ci = cpu_attach_common(self, id);
 	if (ci == NULL)
 		return;
 #ifdef MULTIPROCESSOR
 	if (id > 0) {
 		cpu_spinup(self, ci);
 		return;
+	}
 #endif
 	cpu_setup_prep_generic(self);
+}
 #ifdef MULTIPROCESSOR
 int
 md_setup_trampoline(volatile struct cpu_hatch_data *h, struct cpu_info *ci)
+{
 	if (!openpic_base)
 		return -1;
 	/* construct an absolute branch instruction */
 	/* ba cpu_spinup_trampoline */
 	*(u_int *)EXC_RST = 0x48000002 | (u_int)cpu_spinup_trampoline;
 	__syncicache((void *)EXC_RST, 0x100);
 	h->running = -1;
 	/* Start secondary CPU. */
 	openpic_write(OPENPIC_PROC_INIT, (1 << 1));
 	return 1;
+}
 void
 md_presync_timebase(volatile struct cpu_hatch_data *h)
+{
 	uint64_t tb;
 	/* Sync timebase. */
 	tb = mftb();
 	tb += 100000;  /* 3ms @ 33MHz */
 	h->tbu = tb >> 32;
 	h->tbl = tb & 0xffffffff;
 	while (tb > mftb())
+		;
 	__asm volatile ("sync; isync");
 	h->running = 0;
 	delay(500000);
+}
 void
 md_start_timebase(volatile struct cpu_hatch_data *h)
+{
 	/* do nada */
+}
 void
 md_sync_timebase(volatile struct cpu_hatch_data *h)
+{
 	u_int tbu = h->tbu;
 	u_int tbl = h->tbl;
 	while (h->running == -1)
+		;
 	__asm volatile ("sync; isync");
 	__asm volatile ("mttbl %0" :: "r"(0));
 	__asm volatile ("mttbu %0" :: "r"(tbu));
 	__asm volatile ("mttbl %0" :: "r"(tbl));
+}
 void
 md_setup_interrupts(void)
+{
 	if (!openpic_base)
 		return;
 	/* clear the reset on all CPU's */
 	openpic_write(OPENPIC_PROC_INIT, 0);
 	openpic_set_priority(cpu_number(), 0);
+}
 #endif /* MULTIPROCESSOR */

 @@ -1,198 +1,198 @@
-/*	$NetBSD: mainbus.c,v 1.30 2011/05/17 17:34:52 dyoung Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.31 2011/06/05 17:03:17 matt Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by Christopher G. Demetriou
  *	for the NetBSD Project.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.30 2011/05/17 17:34:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.31 2011/06/05 17:03:17 matt Exp $");
 #include "opt_pci.h"
 #include "opt_residual.h"
 #include "pnpbus.h"
 #include "pci.h"
 #include "isa.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/isa_machdep.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 #include <prep/pnpbus/pnpbusvar.h>
 #include <machine/platform.h>
 #include <machine/residual.h>
-int	mainbus_match(struct device *, struct cfdata *, void *);
+int	mainbus_match(device_t, cfdata_t, void *);
-void	mainbus_attach(struct device *, struct device *, void *);
+void	mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 int	mainbus_print(void *, const char *);
 union mainbus_attach_args {
 	const char *mba_busname;		/* first elem of all */
 	struct pcibus_attach_args mba_pba;
 	struct pnpbus_attach_args mba_paa;
 };
 /* There can be only one. */
 int mainbus_found = 0;
 struct powerpc_isa_chipset genppc_ict;
 struct genppc_pci_chipset *genppc_pct;
 /*
  * Probe for the mainbus; always succeeds.
  */
 int
-mainbus_match(struct device *parent, struct cfdata *match, void *aux)
+mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	if (mainbus_found)
 		return 0;
 	return 1;
+}
 /*
  * Attach the mainbus.
  */
 void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	union mainbus_attach_args mba;
 	struct confargs ca;
 	int i;
 #if NPCI > 0
 	struct genppc_pci_chipset_businfo *pbi;
 #ifdef PCI_NETBSD_CONFIGURE
 	struct extent *ioext, *memext;
 #endif
 #endif
 	mainbus_found = 1;
 	aprint_normal("\n");
 #if defined(RESIDUAL_DATA_DUMP)
 	print_residual_device_info();
 #endif
 	for (i = 0; i < CPU_MAXNUM; i++) {
 		ca.ca_name = "cpu";
 		ca.ca_node = i;
 		config_found_ia(self, "mainbus", &ca, NULL);
+	}
 	/*
 	 * XXX Note also that the presence of a PCI bus should
 	 * XXX _always_ be checked, and if present the bus should be
 	 * XXX 'found'.  However, because of the structure of the code,
 	 * XXX that's not currently possible.
 	 */
 #if NPCI > 0
 	genppc_pct = malloc(sizeof(struct genppc_pci_chipset), M_DEVBUF,
 	    M_NOWAIT);
 	KASSERT(genppc_pct != NULL);
 	prep_pci_get_chipset_tag(genppc_pct);
 	pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
 	    M_DEVBUF, M_NOWAIT);
 	KASSERT(pbi != NULL);
 	pbi->pbi_properties = prop_dictionary_create();
         KASSERT(pbi->pbi_properties != NULL);
 	SIMPLEQ_INIT(&genppc_pct->pc_pbi);
 	SIMPLEQ_INSERT_TAIL(&genppc_pct->pc_pbi, pbi, next);
 	/* find the primary host bridge */
 	setup_pciintr_map(pbi, 0, 0, 0);
 #ifdef PCI_NETBSD_CONFIGURE
 	ioext  = extent_create("pciio",  0x00008000, 0x0000ffff, M_DEVBUF,
 	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", 0x00000000, 0x0fffffff, M_DEVBUF,
 	    NULL, 0, EX_NOWAIT);
 	pci_configure_bus(genppc_pct, ioext, memext, NULL, 0, CACHELINESIZE);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif /* PCI_NETBSD_CONFIGURE */
 #endif /* NPCI */
 /* scan pnpbus first */
 #if NPNPBUS > 0
 	mba.mba_paa.paa_name = "pnpbus";
 	mba.mba_paa.paa_iot = &genppc_isa_io_space_tag;
 	mba.mba_paa.paa_memt = &genppc_isa_mem_space_tag;
 	mba.mba_paa.paa_ic = &genppc_ict;
 	mba.mba_paa.paa_dmat = &isa_bus_dma_tag;
 	config_found_ia(self, "mainbus", &mba.mba_pba, mainbus_print);
 #endif /* NPNPBUS */
 #if NPCI > 0
 	memset(&mba, 0, sizeof(mba));
 	mba.mba_pba._pba_busname = NULL;
 	mba.mba_pba.pba_iot = &prep_io_space_tag;
 	mba.mba_pba.pba_memt = &prep_mem_space_tag;
 	mba.mba_pba.pba_dmat = &pci_bus_dma_tag;
 	mba.mba_pba.pba_dmat64 = NULL;
 	mba.mba_pba.pba_pc = genppc_pct;
 	mba.mba_pba.pba_bus = 0;
 	mba.mba_pba.pba_bridgetag = NULL;
 	mba.mba_pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 	config_found_ia(self, "pcibus", &mba.mba_pba, pcibusprint);
 #endif /* NPCI */
 #ifdef RESIDUAL_DATA_DUMP
 	SIMPLEQ_FOREACH(pbi, &genppc_pct->pc_pbi, next)
 		printf("%s\n", prop_dictionary_externalize(pbi->pbi_properties));
 #endif
+}
 int
 mainbus_print(void *aux, const char *pnp)
+{
 	union mainbus_attach_args *mba = aux;
 	if (pnp)
 		aprint_normal("%s at %s", mba->mba_busname, pnp);
 	return (UNCONF);
+}

 @@ -1,73 +1,73 @@
-/*	$NetBSD: cpu.c,v 1.2 2008/04/28 20:23:34 martin Exp $	*/
+/*	$NetBSD: cpu.c,v 1.3 2011/06/05 17:03:17 matt Exp $	*/
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by NONAKA Kimihiro.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.2 2008/04/28 20:23:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.3 2011/06/05 17:03:17 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-int cpumatch(struct device *, struct cfdata *, void *);
+int cpumatch(device_t, cfdata_t, void *);
-void cpuattach(struct device *, struct device *, void *);
+void cpuattach(device_t, device_t, void *);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
     cpumatch, cpuattach, NULL, NULL);
 extern struct cfdriver cpu_cd;
 int
-cpumatch(struct device *parent, struct cfdata *cfdata, void *aux)
+cpumatch(device_t parent, cfdata_t cfdata, void *aux)
+{
 	struct confargs *ca = aux;
 	if (strcmp(ca->ca_name, cpu_cd.cd_name) != 0)
 		return (0);
 	if (cpu_info[0].ci_dev != NULL)
 		return (0);
 	return (1);
+}
 void
-cpuattach(struct device *parent, struct device *self, void *aux)
+cpuattach(device_t parent, device_t self, void *aux)
+{
 	struct cpu_info *ci;
 	ci = cpu_attach_common(self, 0);
 	if (ci == NULL)
 		return;
 /*	cpu_setup_prep_generic(self);*/
+}

 @@ -1,131 +1,131 @@
-/*	$NetBSD: mainbus.c,v 1.3 2009/01/18 16:46:12 christos Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.4 2011/06/05 17:03:17 matt Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2009/01/18 16:46:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2011/06/05 17:03:17 matt Exp $");
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/autoconf.h>
 #include <powerpc/pio.h>
 #include <machine/bus.h>
 #include "mca.h"
 #if NMCA > 0
 #include <dev/mca/mcavar.h>
 #endif
-int	mainbus_match(struct device *, struct cfdata *, void *);
+int	mainbus_match(device_t, cfdata_t, void *);
-void	mainbus_attach(struct device *, struct device *, void *);
+void	mainbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 int	mainbus_print(void *, const char *);
 union mainbus_attach_args {
 	const char *mba_busname;		/* first elem of all */
 #if NMCA > 0
 	struct mcabus_attach_args mba_mba;
 #endif
 };
 /* There can be only one. */
 int mainbus_found = 0;
 /*
  * Probe for the mainbus; always succeeds.
  */
 int
-mainbus_match(struct device *parent, struct cfdata *match, void *aux)
+mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	if (mainbus_found)
 		return 0;
 	return 1;
+}
 /*
  * Attach the mainbus.
  */
 void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	union mainbus_attach_args mba;
 	struct confargs ca;
 #if DEBUG
 	int slot;
 #endif
 	mainbus_found = 1;
 	aprint_normal("\n");
 	ca.ca_name = "cpu";
 	ca.ca_node = 0;
 	config_found_ia(self, "mainbus", &ca, mainbus_print);
 #if DEBUG
 	printf("scanning MCA bus\n");
 	for (slot=0; slot < 16; slot++) {
 		printf("slot %d == %x%x\n", slot,
 		    inb(0xc0400100 + 1 + (slot<<16)),
 		    inb(0xc0400100 + 0 + (slot<<16)));
+	}
 	printf("done\n");
 	printf(" CFG reg (1)= %x\n", inl(0xc0010080));
 	printf(" TCE reg (1)= %x\n", inl(0xc001009c));
 #endif
 	mba.mba_mba.mba_iot = &rs6000_iocc0_io_space_tag;
 	mba.mba_mba.mba_memt = &rs6000_iocc0_io_space_tag; /* XXX ??? */
 	mba.mba_mba.mba_dmat = NULL; /*&mca_bus_dma_tag;*/
 	mba.mba_mba.mba_mc = NULL;
 	mba.mba_mba.mba_bus = 0;
 	config_found_ia(self, "mcabus", &mba.mba_mba, mcabusprint);
+}
 int
 mainbus_print(void *aux, const char *pnp)
+{
 	union mainbus_attach_args *mba = aux;
 	if (pnp)
 		aprint_normal("%s at %s", mba->mba_busname, pnp);
 	return (UNCONF);
+}

 @@ -1,161 +1,161 @@
-/*	$NetBSD: mainbus.c,v 1.22 2011/05/17 17:34:52 dyoung Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.23 2011/06/05 17:03:19 matt Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by Christopher G. Demetriou
  *	for the NetBSD Project.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22 2011/05/17 17:34:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.23 2011/06/05 17:03:19 matt Exp $");
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <machine/bus.h>
 #include <machine/isa_machdep.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 struct conf_args {
 	const char *ca_name;
 };
-int	mainbus_match(struct device *, struct cfdata *, void *);
+int	mainbus_match(device_t, cfdata_t, void *);
-void	mainbus_attach(struct device *, struct device *, void *);
+void	mainbus_attach(device_t, device_t, void *);
 int	mainbus_print(void *, const char *);
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 struct powerpc_isa_chipset genppc_ict;
 /*
  * Probe for the mainbus; always succeeds.
  */
 int
-mainbus_match(struct device *parent, struct cfdata *match, void *aux)
+mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}
 /*
  * Attach the mainbus.
  */
 void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct conf_args ca;
 	struct pcibus_attach_args pba;
 #if defined(PCI_NETBSD_CONFIGURE)
 	struct extent *ioext, *memext;
 #endif
 	printf("\n");
 	ca.ca_name = "cpu";
 	config_found_ia(self, "mainbus", &ca, mainbus_print);
 	ca.ca_name = "eumb";
 	config_found_ia(self, "mainbus", &ca, mainbus_print);
 	/*
 	 * XXX Note also that the presence of a PCI bus should
 	 * XXX _always_ be checked, and if present the bus should be
 	 * XXX 'found'.  However, because of the structure of the code,
 	 * XXX that's not currently possible.
 	 */
 #if NPCI > 0
 #if defined(PCI_NETBSD_CONFIGURE)
 	ioext  = extent_create("pciio",  0x00001000, 0x0000ffff, M_DEVBUF,
 	    NULL, 0, EX_NOWAIT);
 	memext = extent_create("pcimem", 0x80000000, 0x8fffffff, M_DEVBUF,
 	    NULL, 0, EX_NOWAIT);
 	pci_configure_bus(0, ioext, memext, NULL, 0, 32);
 	extent_destroy(ioext);
 	extent_destroy(memext);
 #endif
 	pba.pba_iot = &sandpoint_io_space_tag;
 	pba.pba_memt = &sandpoint_mem_space_tag;
 	pba.pba_dmat = &pci_bus_dma_tag;
 	pba.pba_dmat64 = NULL;
 	pba.pba_bus = 0;
 	pba.pba_pc = 0;
 	pba.pba_bridgetag = NULL;
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 	config_found_ia(self, "pcibus", &pba, pcibusprint);
 #endif
+}
-static int	cpu_match(struct device *, struct cfdata *, void *);
+static int	cpu_match(device_t, cfdata_t, void *);
-static void	cpu_attach(struct device *, struct device *, void *);
+static void	cpu_attach(device_t, device_t, void *);
-CFATTACH_DECL(cpu, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu, 0,
     cpu_match, cpu_attach, NULL, NULL);
 extern struct cfdriver cpu_cd;
 int
-cpu_match(struct device *parent, struct cfdata *cf, void *aux)
+cpu_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct conf_args *ca = aux;
 	if (strcmp(ca->ca_name, cpu_cd.cd_name) != 0)
 		return 0;
 	if (cpu_info[0].ci_dev != NULL)
 		return 0;
 	return 1;
+}
 void
-cpu_attach(struct device *parent, struct device *self, void *aux)
+cpu_attach(device_t parent, device_t self, void *aux)
+{
 	(void) cpu_attach_common(self, 0);
+}
 int
 mainbus_print(void *aux, const char *pnp)
+{
 	struct conf_args *ca = aux;
 	if (pnp)
 		aprint_normal("%s at %s", ca->ca_name, pnp);
 	return (UNCONF);
+}

 @@ -1,47 +1,47 @@
-/*	$NetBSD: cpu_ofbus.c,v 1.7 2009/03/14 15:36:13 dsl Exp $	*/
+/*	$NetBSD: cpu_ofbus.c,v 1.8 2011/06/05 17:03:18 matt Exp $	*/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_ofbus.c,v 1.7 2009/03/14 15:36:13 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ofbus.c,v 1.8 2011/06/05 17:03:18 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/cpu.h>
 #include <dev/ofw/openfirm.h>
 /*
- * int cpu_ofbus_match(struct device *parent, struct cfdata *cf, void *aux)
+ * int cpu_ofbus_match(device_t parent, cfdata_t cf, void *aux)
+ *
  * Probe for the main cpu. Currently all this does is return 1 to
  * indicate that the cpu was found.
  */
 static int
-cpu_ofbus_match(struct device *parent, struct cfdata *cf, void *aux)
+cpu_ofbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct ofbus_attach_args *aa = aux;
 	char buf[32];
 	if (OF_getprop(aa->oba_phandle, "device_type", buf, sizeof(buf)) < 0)
 		return (0);
 	if (strcmp("cpu", buf))
 		return (0);
 	return(1);
+}
 /*
- * void cpu_ofbus_attach(struct device *parent, struct device *dev, void *aux)
+ * void cpu_ofbus_attach(device_t parent, device_t dev, void *aux)
+ *
  * Attach the main cpu
  */
 static void
-cpu_ofbus_attach(struct device *parent, struct device *self, void *aux)
+cpu_ofbus_attach(device_t parent, device_t self, void *aux)
+{
 	cpu_attach(self);
+}
-CFATTACH_DECL(cpu_ofbus, sizeof(struct device),
+CFATTACH_DECL_NEW(cpu_ofbus, 0,
     cpu_ofbus_match, cpu_ofbus_attach, NULL, NULL);