 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,27 +20,27 @@
  * ``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>
 @@ -53,34 +53,34 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
 #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>
 @@ -115,37 +115,37 @@ struct mainbusdev mainbusdevs[] = {
 #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
 @@ -237,24 +237,24 @@ 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,14 +1,14 @@
-/*	$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
 @@ -19,51 +19,51 @@
  * ``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,14 +1,14 @@
-/*	$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
 @@ -48,63 +48,63 @@
  * 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())

 @@ -1,14 +1,14 @@
-/*	$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
 @@ -32,64 +32,64 @@
  * 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,14 +1,14 @@
-/* $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
 @@ -32,71 +32,71 @@
  * 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)
+{
 @@ -106,33 +106,33 @@ mainbusprint(void *aux, const char *main
 		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)
 @@ -145,28 +145,28 @@ mainbussearch(struct device *parent, str
 		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,14 +1,14 @@
-/* $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.
 @@ -19,59 +19,59 @@
+ *
  * 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);

 @@ -1,14 +1,14 @@
-/*	$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
 @@ -21,50 +21,50 @@
  * 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;
+}
 /*
 @@ -115,27 +115,27 @@ mainbus_cfprint(void *aux, const char *p
 	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

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,65 +20,65 @@
  * ``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)
+{
 @@ -87,27 +87,27 @@ mainbus_print(void *aux, const char *pnp
 	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");
 @@ -140,40 +140,40 @@ mainbus_attach(struct device *parent, st
 		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,14 +1,14 @@
-/* $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.
 @@ -21,66 +21,66 @@
  * 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)
+{

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,86 +20,86 @@
  * ``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,14 +1,14 @@
-/*	$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
 @@ -23,27 +23,27 @@
  * 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>
 @@ -65,48 +65,48 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.55
 #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;
 @@ -118,53 +118,53 @@ cpumatch(struct device *parent, struct c
 	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);
+	}

 @@ -1,14 +1,14 @@
-/*	$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
 @@ -21,59 +21,59 @@
  * 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;

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -17,45 +17,45 @@
  * ``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");

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -24,57 +24,57 @@
  * 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}
 @@ -112,39 +112,39 @@ struct mvme68k_bus_space_tag _mainbus_sp
 	_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:

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,48 +20,48 @@
  * ``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,14 +1,14 @@
-/*	$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
 @@ -21,75 +21,75 @@
  * 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");

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,86 +20,86 @@
  * ``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,14 +1,14 @@
-/*	$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.
 @@ -20,27 +20,27 @@
  * ``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>
 @@ -63,64 +63,64 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.14
 #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",
 @@ -158,27 +158,27 @@ cpu_OFprintcacheinfo(int node)
 	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));
 @@ -197,27 +197,27 @@ cpu_OFgetcache(struct device *self, stru
 			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

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,52 +20,52 @@
  * ``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;
 @@ -198,38 +198,38 @@ init_openpic(int node)
+	}
 #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");

 @@ -1,14 +1,14 @@
-/*	$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
 @@ -26,27 +26,27 @@
  * 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>
 @@ -62,69 +62,69 @@ static struct cputab models[] = {
 	{ 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++;

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,70 +20,70 @@
  * ``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;

 @@ -1,14 +1,14 @@
-/*	$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
 @@ -21,89 +21,89 @@
  * 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;

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,54 +20,54 @@
  * ``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,14 +1,14 @@
-/*	$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.
 @@ -20,79 +20,79 @@
  * ``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);

 @@ -1,14 +1,14 @@
-/*	$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
 @@ -21,71 +21,71 @@
  * 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);
 @@ -112,49 +112,49 @@ mainbus_attach(struct device *parent, st
 	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);