 @@ -1,14 +1,14 @@
-/*      $NetBSD: cpu.h,v 1.92 2011/04/14 08:17:27 matt Exp $      */
+/*      $NetBSD: cpu.h,v 1.93 2011/06/05 16:59:21 matt Exp $      */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
  * 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.
 @@ -113,27 +113,27 @@ extern const struct cpu_mp_dep *mp_dep_c
 extern const struct cpu_dep *dep_call;
 				/* Holds pointer to current CPU struct. */
 struct clockframe {
         int     pc;
         int     ps;
 };
 struct cpu_info {
 	/*
 	 * Public members.
 	 */
 	struct cpu_data ci_data;	/* MI per-cpu data */
-	struct device *ci_dev;		/* device struct for this cpu */
+	device_t ci_dev;		/* device struct for this cpu */
 	int ci_mtx_oldspl;		/* saved spl */
 	int ci_mtx_count;		/* negative count of mutexes */
 	int ci_cpuid;			/* h/w specific cpu id */
 	int ci_want_resched;		/* Should change process */
 	/*
 	 * Private members.
 	 */
 #if defined(__HAVE_FAST_SOFTINTS)
 	lwp_t *ci_softlwps[SOFTINT_COUNT];
 #endif
 	vaddr_t ci_istack;		/* Interrupt stack location */
 	const char *ci_cpustr;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nexus.h,v 1.26 2010/07/01 19:50:12 ragge Exp $	*/
+/*	$NetBSD: nexus.h,v 1.27 2011/06/05 16:59:21 matt Exp $	*/
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * 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.
 @@ -104,27 +104,27 @@ struct abus_attach_args {
 struct sbi_attach_args {
 	int sa_nexnum; 		/* This nexus TR number */
 	int sa_type;		/* This nexus type */
 	int sa_sbinum;
 	bus_space_tag_t sa_iot;
 	bus_space_handle_t sa_ioh;
 	bus_dma_tag_t sa_dmat;
         bus_addr_t sa_base;
 };
 /* Memory device struct. This should be somewhere else */
 struct mem_softc {
-	struct	device *sc_dev;
+	device_t sc_dev;
 	void *	sc_memaddr;
 	int	sc_memtype;
 	int	sc_memnr;
 };
 struct ibus_attach_args {
 	const char *ia_type;
 	int ia_num;
 	int ia_partyp;
 	paddr_t ia_addr;
 };
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: types.h,v 1.41 2010/12/22 01:03:18 matt Exp $	*/
+/*	$NetBSD: types.h,v 1.42 2011/06/05 16:59:21 matt Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * 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.
 @@ -67,14 +67,16 @@ typedef int		register_t;
 typedef volatile char	__cpu_simple_lock_t;
 #define __SIMPLELOCK_LOCKED	1
 #define __SIMPLELOCK_UNLOCKED	0
 /* The VAX does not have strict alignment requirements. */
 #define	__NO_STRICT_ALIGNMENT
 #define	__HAVE_DEVICE_REGISTER
 #define	__HAVE_SYSCALL_INTERN
 #define	__HAVE_FAST_SOFTINTS
 #define	__HAVE_CPU_DATA_FIRST
 #define	__HAVE___LWP_GETPRIVATE_FAST
 #endif	/* _MACHTYPES_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uba_ubi.c,v 1.2 2010/12/14 23:38:30 matt Exp $	   */
+/*	$NetBSD: uba_ubi.c,v 1.3 2011/06/05 16:59:21 matt Exp $	   */
 /*
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * 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. Neither the name of the University nor the names of its contributors
 @@ -58,27 +58,27 @@
  * 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.
+ *
  *	@(#)uba.c	7.10 (Berkeley) 12/16/90
  *	@(#)autoconf.c	7.20 (Berkeley) 5/9/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba_ubi.c,v 1.2 2010/12/14 23:38:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_ubi.c,v 1.3 2011/06/05 16:59:21 matt Exp $");
 #define _VAX_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <machine/nexus.h>
 #include <machine/sgmap.h>
 #include <dev/qbus/ubavar.h>
 @@ -88,28 +88,28 @@ __KERNEL_RCSID(0, "$NetBSD: uba_ubi.c,v
 #include "locators.h"
 /* Some UBI-specific defines */
 #define	UBASIZE		((UBAPAGES + UBAIOPAGES) * VAX_NBPG)
 #define UMEM730     	(0xfc0000)
 #define	UIOPAGE		(UMEM730 + (UBAPAGES * VAX_NBPG))
 /*
  * The DW780, DW750 and DW730 are quite similar to their function from
  * a programmers point of view. Differencies are number of BDP's
  * and bus status/command registers, the latter are (partly) IPR's
  * on 750.
  */
-static	int	dw730_match(struct device *, struct cfdata *, void *);
+static	int	dw730_match(device_t, cfdata_t, void *);
-static	void	dw730_attach(struct device *, struct device *, void *);
+static	void	dw730_attach(device_t, device_t, void *);
 static	void	dw730_init(struct uba_softc*);
 #ifdef notyet
 static	void	dw730_purge(struct uba_softc *, int);
 #endif
 CFATTACH_DECL_NEW(uba_ubi, sizeof(struct uba_vsoftc),
     dw730_match, dw730_attach, NULL, NULL);
 extern	struct vax_bus_space vax_mem_bus_space;
 int
 dw730_match(device_t parent, cfdata_t cf, void *aux)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ka6400.c,v 1.15 2010/12/14 23:44:49 matt Exp $	*/
+/*	$NetBSD: ka6400.c,v 1.16 2011/06/05 16:59:21 matt Exp $	*/
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. 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
 @@ -30,27 +30,27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * KA6400 specific CPU code.
  */
 /*
  * TODO:
  *	- Machine check code
  *	- Vector processor code
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka6400.c,v 1.15 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka6400.c,v 1.16 2011/06/05 16:59:21 matt Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <machine/ka670.h>
 #include <machine/nexus.h>
 @@ -184,27 +184,27 @@ ka6400_conf(void)
 #define	MS62_CTL1	20
 #define MS62_ECCERR	24
 #define MS62_ECCEA	28
 #define MS62_ILK0	32
 #define MS62_ILK1	36
 #define MS62_ILK2	40
 #define MS62_ILK3	44
 #define MS62_CTL2	48
 static int ms6400_match(device_t , cfdata_t, void *);
 static void ms6400_attach(device_t , device_t , void*);
 struct mem_xmi_softc {
-	struct device *sc_dev;
+	device_t sc_dev;
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;
 };
 CFATTACH_DECL_NEW(mem_xmi, sizeof(struct mem_xmi_softc),
     ms6400_match, ms6400_attach, NULL, NULL);
 static int
 ms6400_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct xmi_attach_args * const xa = aux;
 	if (bus_space_read_2(xa->xa_iot, xa->xa_ioh, XMI_TYPE) != XMIDT_MS62)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ka88.c,v 1.15 2010/12/14 23:44:49 matt Exp $	*/
+/*	$NetBSD: ka88.c,v 1.16 2011/06/05 16:59:21 matt Exp $	*/
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. 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
 @@ -29,27 +29,27 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * KA88 specific CPU code.
  */
 /*
  * TODO:
  *	- Machine check code
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.15 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.16 2011/06/05 16:59:21 matt Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/lwp.h>
 #include <machine/nexus.h>
 @@ -155,27 +155,27 @@ ka88_cpu_attach(device_t parent, device_
 		return;
+	}
 	ci = curcpu();
 	self->dv_private = ci;
 	ci->ci_dev = self;
 	ci->ci_cpuid = device_unit(self);
 	ci->ci_slotid = na->na_slot;
+}
 CFATTACH_DECL_NEW(cpu_nmi, 0,
     ka88_cpu_match, ka88_cpu_attach, NULL, NULL);
 struct mem_nmi_softc {
-	struct device *sc_dev;
+	device_t sc_dev;
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;
 };
 static int
 ms88_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct nmi_attach_args * const na = aux;
 	if (cf->cf_loc[NMICF_SLOT] != NMICF_SLOT_DEFAULT &&
 	    cf->cf_loc[NMICF_SLOT] != na->na_slot)
 		return 0;
 	if (na->na_slot != 10)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ka730.c,v 1.2 2010/12/14 23:44:49 matt Exp $ */
+/*	$NetBSD: ka730.c,v 1.3 2011/06/05 16:59:21 matt Exp $ */
 /*
  * Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
  * 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. Neither the name of the University nor the names of its contributors
 @@ -58,27 +58,27 @@
  * 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.
+ *
  *	@(#)ka730.c	7.4 (Berkeley) 5/9/91
  *	@(#)autoconf.c	7.20 (Berkeley) 5/9/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka730.c,v 1.2 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka730.c,v 1.3 2011/06/05 16:59:21 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <machine/ka730.h>
 #include <machine/clock.h>
 #include <machine/sid.h>
 #include <vax/vax/gencons.h>
 @@ -110,55 +110,55 @@ struct	cpu_dep ka730_calls = {
 void
 ka730_conf()
+{
 	/* Call ctuattach() here so it can setup its vectors. */
 	ctuattach();
+}
 void
 ka730_attach_cpu(device_t self)
+{
 	aprint_normal("KA730, ucode rev %d\n", V730UCODE(vax_cpudata));
+}
-static void ka730_memenable(struct device *, struct device *, void *);
+static void ka730_memenable(device_t, device_t, void *);
-static int ka730_memmatch(struct device  *, struct cfdata *, void *);
+static int ka730_memmatch(device_t, cfdata_t, void *);
-CFATTACH_DECL(mem_ubi, sizeof(struct device),
+CFATTACH_DECL_NEW(mem_ubi, 0,
     ka730_memmatch, ka730_memenable, NULL, NULL);
 int
-ka730_memmatch(struct device *parent, struct cfdata *cf, void *aux)
+ka730_memmatch(device_t parent, cfdata_t cf, void *aux)
+{
-	struct	sbi_attach_args *sa = (struct sbi_attach_args *)aux;
+	struct	sbi_attach_args *sa = aux;
 	if (cf->cf_loc[UBICF_TR] != sa->sa_nexnum &&
 	    cf->cf_loc[UBICF_TR] > UBICF_TR_DEFAULT)
 		return 0;
 	if (sa->sa_type != NEX_MEM16)
 		return 0;
 	return 1;
+}
 struct	mcr730 {
 	int	mc_addr;		/* address and syndrome */
 	int	mc_err;			/* error bits */
 };
 /* enable crd interrupts */
 void
-ka730_memenable(struct device *parent, struct device *self, void *aux)
+ka730_memenable(device_t parent, device_t self, void *aux)
+{
+}
 /* log crd errors */
 void
 ka730_memerr()
+{
+}
 #define NMC730 12
 const char *mc730[]={"0","1","2","3","4","5","6","7","8","9","10","11","12","13",
 	"14","15"};

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ka820.c,v 1.53 2010/12/14 23:44:49 matt Exp $	*/
+/*	$NetBSD: ka820.c,v 1.54 2011/06/05 16:59:21 matt Exp $	*/
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
+ *
  * 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
 @@ -29,27 +29,27 @@
  * 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.
+ *
  *	@(#)ka820.c	7.4 (Berkeley) 12/16/90
  */
 /*
  * KA820 specific CPU code.  (Note that the VAX8200 uses a KA820, not
  * a KA8200.  Sigh.)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka820.c,v 1.53 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka820.c,v 1.54 2011/06/05 16:59:21 matt Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <machine/ka820.h>
 #include <machine/nexus.h>
 @@ -269,27 +269,27 @@ struct ms820regs {
 #define MS2_RDSERR	0x80000000	/* rds error (rw) */
 #define MS2_HIERR	0x40000000	/* high error rate (rw) */
 #define MS2_CRDERR	0x20000000	/* crd error (rw) */
 #define MS2_ADRSERR	0x10000000	/* rds due to addr par err (rw) */
 #define MS2_MBZ		0x0f000080	/* zero */
 #define MS2_ADDR	0x00fffe00	/* address in error (relative) (ro) */
 #define MS2_INTLVADDR	0x00000100	/* error was in bank 1 (ro) */
 #define MS2_SYN		0x0000007f	/* error syndrome (ro, rw diag) */
 static int ms820_match(device_t, cfdata_t, void *);
 static void ms820_attach(device_t, device_t, void*);
 struct mem_bi_softc {
-	struct device *sc_dev;
+	device_t sc_dev;
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;
 };
 CFATTACH_DECL_NEW(mem_bi, sizeof(struct mem_bi_softc),
     ms820_match, ms820_attach, NULL, NULL);
 static int
 ms820_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct bi_attach_args * const ba = aux;
 	if (bus_space_read_2(ba->ba_iot, ba->ba_ioh, BIREG_DTYPE) != BIDT_MS820)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: multicpu.c,v 1.31 2010/12/14 23:44:49 matt Exp $	*/
+/*	$NetBSD: multicpu.c,v 1.32 2011/06/05 16:59:21 matt Exp $	*/
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. 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
 @@ -25,49 +25,49 @@
  * 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.
  */
 /*
  * CPU-type independent code to spin up other VAX CPU's.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.31 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.32 2011/06/05 16:59:21 matt Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/xcall.h>
 #include <uvm/uvm_extern.h>
 #include <vax/vax/gencons.h>
 #include "ioconf.h"
 const struct cpu_mp_dep *mp_dep_call;
 struct cpuq {
 	SIMPLEQ_ENTRY(cpuq) cq_q;
 	struct cpu_info *cq_ci;
-	struct device *cq_dev;
+	device_t cq_dev;
 };
 SIMPLEQ_HEAD(, cpuq) cpuq = SIMPLEQ_HEAD_INITIALIZER(cpuq);
 extern long avail_start, avail_end;
 struct cpu_info_qh cpus = SIMPLEQ_HEAD_INITIALIZER(cpus);
 void
 cpu_boot_secondary_processors(void)
+{
 	struct cpuq *q;
 	while ((q = SIMPLEQ_FIRST(&cpuq))) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ubi.c,v 1.3 2010/12/14 23:44:50 matt Exp $ */
+/*	$NetBSD: ubi.c,v 1.4 2011/06/05 16:59:21 matt Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * 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,68 +21,68 @@
  * 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: ubi.c,v 1.3 2010/12/14 23:44:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubi.c,v 1.4 2011/06/05 16:59:21 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <machine/nexus.h>
 #include <machine/sid.h>
 #include <machine/ka730.h>
 static	int ubi_print(void *, const char *);
-static	int ubi_match(struct device *, struct cfdata *, void *);
+static	int ubi_match(device_t, cfdata_t, void *);
-static	void ubi_attach(struct device *, struct device *, void*);
+static	void ubi_attach(device_t, device_t, void*);
-CFATTACH_DECL_NEW(ubi, sizeof(struct device),
+CFATTACH_DECL_NEW(ubi, 0,
     ubi_match, ubi_attach, NULL, NULL);
 int
 ubi_print(void *aux, const char *name)
+{
 	struct sbi_attach_args *sa = (struct sbi_attach_args *)aux;
 	if (name)
 		aprint_normal("unknown device 0x%x at %s", sa->sa_type, name);
 	aprint_normal(" tr%d", sa->sa_nexnum);
 	return (UNCONF);
+}
 int
-ubi_match(struct device *parent, struct cfdata *cf, void *aux)
+ubi_match(device_t parent, cfdata_t cf, void *aux)
+{
 	if (vax_bustype == VAX_UNIBUS)
 		return 1;
 	return 0;
+}
 void
-ubi_attach(struct device *parent, struct device *self, void *aux)
+ubi_attach(device_t parent, device_t self, void *aux)
+{
 	struct	sbi_attach_args sa;
 	printf("\n");
         sa.sa_base = NEX730;
 #define NEXPAGES (sizeof(struct nexus) / VAX_NBPG)
 #if 0
 	/*
 	 * Probe for memory, can be in the first 4 slots.
 	 */