 @@ -1,239 +1,239 @@
-/*      $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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed at Ludd, University of Lule}
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _VAX_CPU_H_
 #define _VAX_CPU_H_
 #if defined(_KERNEL_OPT)
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #endif
 #define	CPU_PRINTFATALTRAPS	1
 #define	CPU_CONSDEV		2
 #define	CPU_BOOTED_DEVICE	3
 #define	CPU_BOOTED_KERNEL	4
 #define CPU_MAXID		5
 #ifdef _KERNEL
 #include <sys/cdefs.h>
 #include <sys/queue.h>
 #include <sys/device_if.h>
 #include <sys/cpu_data.h>
 #include <machine/mtpr.h>
 #include <machine/pcb.h>
 #include <machine/uvax.h>
 #include <machine/psl.h>
 #define enablertclock()
 /*
  * All cpu-dependent info is kept in this struct. Pointer to the
  * struct for the current cpu is set up in locore.c.
  */
 struct cpu_info;
 struct cpu_dep {
 	void	(*cpu_steal_pages)(void); /* pmap init before mm is on */
 	int	(*cpu_mchk)(void *);   /* Machine check handling */
 	void	(*cpu_memerr)(void); /* Memory subsystem errors */
 	    /* Autoconfiguration */
 	void	(*cpu_conf)(void);
 	int	(*cpu_gettime)(struct timeval *); /* Read cpu clock time */
 	void	(*cpu_settime)(struct timeval *); /* Write system time to cpu */
 	short	cpu_vups;		/* speed of cpu */
 	short	cpu_scbsz;		/* (estimated) size of SCB */
 	void	(*cpu_halt)(void);	/* Cpu dependent halt call */
 	void	(*cpu_reboot)(int);	/* Cpu dependent reboot call */
 	void	(*cpu_clrf)(void);	/* Clear cold/warm start flags */
 	const char * const *cpu_devs;	/* mainbus devices */
 	void	(*cpu_attach_cpu)(device_t);	/* print CPU info */
 	int     cpu_flags;
 	void	(*cpu_badaddr)(void);	/* cpu-specific badaddr() */
 };
 #if defined(MULTIPROCESSOR)
 /*
  * All cpu-dependent calls for multicpu systems goes here.
  */
 struct cpu_mp_dep {
 	void	(*cpu_startslave)(struct cpu_info *);
 	void	(*cpu_send_ipi)(struct cpu_info *);
 	void	(*cpu_cnintr)(void);
 };
 /*
  * NOTE: This is not bit mask, this is bit _number_.
  */
 #define	IPI_START_CNTX	1	/* Start console transmitter, proc out */
 #define	IPI_SEND_CNCHAR	2	/* Write char to console, kernel printf */
 #define	IPI_RUNNING	3	/* This CPU just started to run */
 #define	IPI_TBIA	4	/* Flush the TLB */
 #define	IPI_DDB		5	/* Jump into the DDB loop */
 #define	IPI_XCALL	6	/* Helper for xcall(9) */
 #define	IPI_DEST_MASTER	-1	/* Destination is mastercpu */
 #define	IPI_DEST_ALL	-2	/* Broadcast */
 extern const struct cpu_mp_dep *mp_dep_call;
 #endif /* defined(MULTIPROCESSOR) */
 #define	CPU_RAISEIPL	1	/* Must raise IPL until intr is handled */
 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;
 	int ci_slotid;			/* cpu slot */
 #if defined(MULTIPROCESSOR)
 	struct lwp *ci_curlwp;		/* current lwp (for other cpus) */
 	volatile int ci_flags;		/* See below */
 	long ci_ipimsgs;		/* Sent IPI bits */
 	struct trapframe *ci_ddb_regs;	/* Used by DDB */
 	SIMPLEQ_ENTRY(cpu_info) ci_next; /* next cpu_info */
 #endif
 	uintptr_t ci_cas_addr;		/* current address doing CAS in a RAS */
 };
 #define	CI_MASTERCPU	1		/* Set if master CPU */
 #define	CI_RUNNING	2		/* Set when a slave CPU is running */
 #define	CI_STOPPED	4		/* Stopped (in debugger) */
 extern int cpu_printfataltraps;
 #define	curcpu()		(curlwp->l_cpu + 0)
 #define	curlwp			((struct lwp *)mfpr(PR_SSP))
 #define	cpu_number()		(curcpu()->ci_cpuid)
 #define	cpu_need_resched(ci, flags)		\
 	do {					\
 		(ci)->ci_want_resched = 1;	\
 		mtpr(AST_OK,PR_ASTLVL);		\
 	} while (/*CONSTCOND*/ 0)
 #define	cpu_proc_fork(x, y)	do { } while (/*CONSCOND*/0)
 #define	cpu_idle()		do { } while (/*CONSCOND*/0)
 static inline bool
 cpu_intr_p(void)
+{
 	register_t psl;
 	__asm("movpsl %0" : "=g"(psl));
 	return (psl & PSL_IS) != 0;
+}
 #if defined(MULTIPROCESSOR)
 #define	CPU_IS_PRIMARY(ci)	((ci)->ci_flags & CI_MASTERCPU)
 #define	CPU_INFO_ITERATOR	int
 #define	CPU_INFO_FOREACH(cii, ci)	cii = 0, ci = SIMPLEQ_FIRST(&cpus); \
 					ci != NULL; \
 					ci = SIMPLEQ_NEXT(ci, ci_next)
 extern SIMPLEQ_HEAD(cpu_info_qh, cpu_info) cpus;
 extern char vax_mp_tramp;
 #endif
 /*
  * Notify the current process (p) that it has a signal pending,
  * process as soon as possible.
  */
 #define cpu_signotify(l)     mtpr(AST_OK,PR_ASTLVL)
 /*
  * Give a profiling tick to the current process when the user profiling
  * buffer pages are invalid.  On the hp300, request an ast to send us
  * through trap, marking the proc as needing a profiling tick.
  */
 #define cpu_need_proftick(l) do { (l)->l_pflag |= LP_OWEUPC; mtpr(AST_OK,PR_ASTLVL); } while (/*CONSTCOND*/ 0)
 /*
  * This defines the I/O device register space size in pages.
  */
 #define	IOSPSZ	((64*1024) / VAX_NBPG)	/* 64k == 128 pages */
 #define	LWP_PC(l)	cpu_lwp_pc(l)
 struct device;
 struct buf;
 struct pte;
 #include <sys/lwp.h>
 /* Some low-level prototypes */
 #if defined(MULTIPROCESSOR)
 void	cpu_slavesetup(device_t, int);
 void	cpu_boot_secondary_processors(void);
 void	cpu_send_ipi(int, int);
 void	cpu_handle_ipi(void);
 #endif
 vaddr_t	cpu_lwp_pc(struct lwp *);
 int	badaddr(volatile void *, int);
 void	dumpconf(void);
 void	dumpsys(void);
 void	swapconf(void);
 void	disk_printtype(int, int);
 void	disk_reallymapin(struct buf *, struct pte *, int, int);
 vaddr_t	vax_map_physmem(paddr_t, size_t);
 void	vax_unmap_physmem(vaddr_t, size_t);
 void	ioaccess(vaddr_t, paddr_t, size_t);
 void	iounaccess(vaddr_t, size_t);
 void	findcpu(void);
 #ifdef DDB
 int	kdbrint(int);
 #endif
 #endif /* _KERNEL */
 #ifdef _STANDALONE
 void	findcpu(void);
 #endif
 #endif /* _VAX_CPU_H_ */

 @@ -1,199 +1,199 @@
-/*	$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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)nexus.h	7.3 (Berkeley) 5/9/91
  */
 /*
  * ABus support added by Johnny Billquist 2010.
  */
 #ifndef _VAX_NEXUS_H_
 #define _VAX_NEXUS_H_
 #include <machine/bus.h>
 #ifdef _KERNEL
 #include "opt_cputype.h"
 #endif
 /*
  * Different definitions for nicer autoconf probing.
  */
 enum bustypes {
 	VAX_SBIBUS,		/* SBI parent (780) */
 	VAX_CMIBUS,		/* CMI backplane (750) */
 	VAX_UNIBUS,		/* Direct backplane (730) */
 	VAX_ABUS,		/* ABus (8600) */
 	VAX_BIBUS,		/* BI bus (8200) */
 	VAX_NMIBUS,		/* NMI backplane (8800) */
 	VAX_VSBUS,		/* Virtual vaxstation bus */
 	VAX_IBUS,		/* Internal Microvax bus */
 	VAX_XMIBUS,		/* XMI master bus (6000) */
 };
 /*
  * Information about nexus's.
+ *
  * Each machine has an address of backplane slots (nexi).
  * Each nexus is some type of adapter, whose code is the low
  * byte of the first word of the adapter address space.
  * At boot time the system looks through the array of available
  * slots and finds the interconnects for the machine.
+ *
  * VAX8600 nexus information is located in ioa.h
  */
 #define IO_CMI750       2
 #define MAXNMCR         1
 #define	NNEXSBI		16
 #if VAX780 || VAXANY
 #define	NNEX780	NNEXSBI
 #define	NEX780	((struct nexus *)0x20000000)
 #endif
 #if VAX730 || VAXANY
 #define	NNEX730	NNEXSBI
 #define	NEX730	((struct nexus *)0xf20000)
 #endif
 #define	NEXSIZE	0x2000
 #ifdef _KERNEL
 struct	nexus {
 	union nexcsr {
 		long	nex_csr;
 		u_char	nex_type;
 	} nexcsr;
 	long	nex_pad[NEXSIZE / sizeof (long) - 1];
 };
 struct abus_attach_args {
         const char *aa_name;
         int aa_type;
         bus_addr_t aa_base;
         int aa_num;
 	bus_space_tag_t aa_iot;
 	bus_space_handle_t aa_ioh;
 	bus_dma_tag_t aa_dmat;
 };
 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
 /*
  * Bits in high word of nexus's.
  */
 #define	SBI_PARFLT	(1<<31)		/* sbi parity fault */
 #define	SBI_WSQFLT	(1<<30)		/* write sequence fault */
 #define	SBI_URDFLT	(1<<29)		/* unexpected read data fault */
 #define	SBI_ISQFLT	(1<<28)		/* interlock sequence fault */
 #define	SBI_MXTFLT	(1<<27)		/* multiple transmitter fault */
 #define	SBI_XMTFLT	(1<<26)		/* transmit fault */
 #define	NEX_CFGFLT	(0xfc000000)
 #ifndef _LOCORE
 #if VAX780 || VAX8600 || VAXANY
 #define	NEXFLT_BITS \
 "\20\40PARFLT\37WSQFLT\36URDFLT\35ISQFLT\34MXTFLT\33XMTFLT"
 #endif
 #endif
 #define	NEX_APD		(1<<23)		/* adaptor power down */
 #define	NEX_APU		(1<<22)		/* adaptor power up */
 #define	MBA_OT		(1<<21)		/* overtemperature */
 #define	UBA_UBINIT	(1<<18)		/* unibus init */
 #define	UBA_UBPDN	(1<<17)		/* unibus power down */
 #define	UBA_UBIC	(1<<16)		/* unibus initialization complete */
 /*
  * Types for nex_type.
  */
 #define	NEX_ANY		0		/* pseudo for handling 11/750 */
 #define	NEX_MEM4	0x08		/* 4K chips, non-interleaved mem */
 #define	NEX_MEM4I	0x09		/* 4K chips, interleaved mem */
 #define	NEX_MEM16	0x10		/* 16K chips, non-interleaved mem */
 #define	NEX_MEM16I	0x11		/* 16K chips, interleaved mem */
 #define	NEX_MBA		0x20		/* Massbus adaptor */
 #define	NEX_UBA0	0x28		/* Unibus adaptor */
 #define	NEX_UBA1	0x29		/* 4 flavours for 4 addr spaces */
 #define	NEX_UBA2	0x2a
 #define	NEX_UBA3	0x2b
 #define	NEX_DR32	0x30		/* DR32 user i'face to SBI */
 #define	NEX_CI		0x38		/* CI adaptor */
 #define	NEX_MPM0	0x40		/* Multi-port mem */
 #define	NEX_MPM1	0x41		/* Who knows why 4 different ones ? */
 #define	NEX_MPM2	0x42
 #define	NEX_MPM3	0x43
 #define	NEX_MEM64L	0x68		/* 64K chips, non-interleaved, lower */
 #define	NEX_MEM64LI	0x69		/* 64K chips, ext-interleaved, lower */
 #define	NEX_MEM64U	0x6a		/* 64K chips, non-interleaved, upper */
 #define	NEX_MEM64UI	0x6b		/* 64K chips, ext-interleaved, upper */
 #define	NEX_MEM64I	0x6c		/* 64K chips, interleaved */
 #define	NEX_MEM256L	0x70		/* 256K chips, non-interleaved, lower */
 #define	NEX_MEM256LI	0x71		/* 256K chips, ext-interleaved, lower */
 #define	NEX_MEM256U	0x72		/* 256K chips, non-interleaved, upper */
 #define	NEX_MEM256UI	0x73		/* 256K chips, ext-interleaved, upper */
 #define	NEX_MEM256I	0x74		/* 256K chips, interleaved */
 /* Memory classes */
 #define	M_NONE		0
 #define	M780C		1
 #define	M780EL		2
 #define	M780EU		3
 /* Memory recover defines */
 #define	MCHK_PANIC	-1
 #define	MCHK_RECOVERED	0
 #endif /* _VAX_NEXUS_H_ */

 @@ -1,175 +1,175 @@
-/*	$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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)uba.c	7.10 (Berkeley) 12/16/90
  *	@(#)autoconf.c	7.20 (Berkeley) 5/9/91
  */
 /*
  * Copyright (c) 1996 Jonathan Stone.
  * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)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>
 #include <vax/uba/uba_common.h>
 #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)
+{
 	struct sbi_attach_args *sa = (struct sbi_attach_args *)aux;
 	if (cf->cf_loc[UBICF_TR] != sa->sa_nexnum &&
 	    cf->cf_loc[UBICF_TR] != UBICF_TR_DEFAULT)
 		return 0;
 	/*
 	 * The uba type is actually only telling where the uba
 	 * space is in nexus space.
 	 */
 	if ((sa->sa_type & ~3) != NEX_UBA0)
 		return 0;
 	return 1;
+}
 void
 dw730_attach(device_t parent, device_t self, void *aux)
+{
 	struct uba_vsoftc *sc = device_private(self);
 	struct sbi_attach_args *sa = aux;
 	printf(": DW730\n");
 	/*
 	 * Fill in bus specific data.
 	 */
 	sc->uv_sc.uh_dev = self;
 	sc->uv_sc.uh_ubainit = dw730_init;
 #ifdef notyet
 	sc->uv_sc.uh_ubapurge = dw730_purge;
 #endif
 	sc->uv_sc.uh_iot = &vax_mem_bus_space;
 	sc->uv_sc.uh_dmat = &sc->uv_dmat;
 	sc->uv_sc.uh_type = UBA_UBA;
 	sc->uv_sc.uh_nr = sa->sa_type == NEX_UBA1;
 	/*
 	 * Fill in variables used by the sgmap system.
 	 */
 	sc->uv_size = UBAPAGES * VAX_NBPG;
 	sc->uv_uba = (void *)sa->sa_ioh; /* Map registers is in adaptor */
 	uba_dma_init(sc);
 	uba_attach(&sc->uv_sc, UIOPAGE);
+}
 void
 dw730_init(struct uba_softc *sc)
+{
 	mtpr(0, PR_IUR);
 	DELAY(500000);
+}
 #ifdef notyet
 void
 dw730_purge(struct uba_softc sc, int bdp)
+{
 	sc->uh_uba->uba_dpr[bdp] |= UBADPR_PURGE | UBADPR_NXM | UBADPR_UCE;
+}
 #endif

 @@ -1,447 +1,447 @@
-/*	$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
  *    must display the following acknowledgement:
  *      This product includes software developed at Ludd, University of
  *      Lule}, Sweden and its contributors.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * 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>
 #include <machine/clock.h>
 #include <machine/scb.h>
 #include <machine/sid.h>
 #include <machine/cca.h>
 #include <machine/rpb.h>
 #include <dev/xmi/xmireg.h>
 #include <dev/xmi/xmivar.h>
 #include "ioconf.h"
 #include "locators.h"
 static int *rssc;
 struct cca *cca;
 int mastercpu;
 static int ka6400_match(device_t , cfdata_t, void *);
 static void ka6400_attach(device_t , device_t , void*);
 static void ka6400_memerr(void);
 static void ka6400_conf(void);
 static int ka6400_mchk(void *);
 static void ka6400_steal_pages(void);
 static const char * const ka6400_devs[] = { "xmi", NULL };
 const struct cpu_dep ka6400_calls = {
 	.cpu_steal_pages = ka6400_steal_pages,
 	.cpu_mchk	= ka6400_mchk,
 	.cpu_memerr	= ka6400_memerr,
 	.cpu_conf	= ka6400_conf,
 	.cpu_gettime	= generic_gettime,
 	.cpu_settime	= generic_settime,
 	.cpu_vups	= 12,	/* ~VUPS */
 	.cpu_scbsz	= 16,	/* SCB pages */
 };
 #if defined(MULTIPROCESSOR)
 static void ka6400_startslave(struct cpu_info *);
 static void ka6400_txrx(int, const char *, int);
 static void ka6400_sendstr(int, const char *);
 static void ka6400_sergeant(int);
 static int rxchar(void);
 static void ka6400_putc(int);
 static void ka6400_cnintr(void);
 #include <dev/cons.h>
 #include <vax/vax/gencons.h>
 cons_decl(gen);
 const struct cpu_mp_dep ka6400_mp_calls = {
 	.cpu_startslave	= ka6400_startslave,
 	.cpu_cnintr	= ka6400_cnintr,
 };
 #endif
 CFATTACH_DECL_NEW(cpu_xmi, 0,
     ka6400_match, ka6400_attach, NULL, NULL);
 static int
 ka6400_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_KA64)
 		return 0;
 	if (cf->cf_loc[XMICF_NODE] != XMICF_NODE_DEFAULT &&
 	    cf->cf_loc[XMICF_NODE] != xa->xa_nodenr)
 		return 0;
 	return 1;
+}
 static void
 ka6400_attach(device_t parent, device_t self, void *aux)
+{
 	struct cpu_info *ci;
 	struct xmi_attach_args * const xa = aux;
 	int vp;
 	vp = (cca->cca_vecenab & (1 << xa->xa_nodenr));
 	aprint_normal("\n");
 	aprint_normal_dev(self, "KA6400 (%s) rev %d%s\n",
 	    mastercpu == xa->xa_nodenr ? "master" : "slave",
 	    bus_space_read_4(xa->xa_iot, xa->xa_ioh, XMI_TYPE) >> 16,
 	    (vp ? ", vector processor present" : ""));
 	if (xa->xa_nodenr != mastercpu) {
 #if defined(MULTIPROCESSOR)
 		v_putc = ka6400_putc;	/* Need special console handling */
 		cpu_slavesetup(self, xa->xa_nodenr);
 #endif
 		return;
+	}
 	mtpr(0, PR_VPSR); /* Can't use vector processor */
 	ci = curcpu();
 	self->dv_private = ci;
 	ci->ci_dev = self;
 	ci->ci_cpuid = device_unit(self);
 	ci->ci_slotid = xa->xa_nodenr;
+}
 void
 ka6400_conf(void)
+{
 	int mapaddr;
 	rssc = (void *)vax_map_physmem(RSSC_ADDR, 1);
 	mastercpu = rssc[RSSC_IPORT/4] & 15;
 	mapaddr = (cca ? (int)cca : rpb.cca_addr);
 	cca = (void *)vax_map_physmem(mapaddr, vax_btoc(sizeof(struct cca)));
+}
 /*
  * MS62 support.
  * This code should:
  *	1: Be completed.
  *	2: (eventually) move to dev/xmi/; it is used by Mips also.
  */
 #define MEMRD(reg) bus_space_read_4(sc->sc_iot, sc->sc_ioh, (reg))
 #define MEMWR(reg, val) bus_space_write_4(sc->sc_iot, sc->sc_ioh, (reg), (val))
 #define MS62_TYPE	0
 #define MS62_XBE	4
 #define MS62_SEADR	16
 #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)
 		return 0;
 	if (cf->cf_loc[XMICF_NODE] != XMICF_NODE_DEFAULT &&
 	    cf->cf_loc[XMICF_NODE] != xa->xa_nodenr)
 		return 0;
 	return 1;
+}
 static void
 ms6400_attach(device_t parent, device_t self, void *aux)
+{
 	struct mem_xmi_softc * const sc = device_private(self);
 	struct xmi_attach_args * const xa = aux;
 	sc->sc_dev = self;
 	sc->sc_iot = xa->xa_iot;
 	sc->sc_ioh = xa->xa_ioh;
 	aprint_normal(": MS62, rev %d, size 32MB\n", MEMRD(MS62_TYPE) >> 16);
+}
 static void
 ka6400_memerr(void)
+{
 	printf("ka6400_memerr\n");
+}
 struct mc6400frame {
 	int	mc64_summary;		/* summary parameter */
 	int	mc64_va;		/* va register */
 	int	mc64_vb;		/* memory address */
 	int	mc64_sisr;		/* status word */
 	int	mc64_state;		/* error pc */
 	int	mc64_sc;		/* micro pc */
 	int	mc64_pc;		/* current pc */
 	int	mc64_psl;		/* current psl */
 };
 static int
 ka6400_mchk(void *cmcf)
+{
 	return (MCHK_PANIC);
+}
 #if defined(MULTIPROCESSOR)
 #define RXBUF	80
 static char rxbuf[RXBUF];
 static int got = 0, taken = 0;
 static int expect = 0;
 #endif
 #if 0
 /*
  * Receive a character from logical console.
  */
 static void
 rxcdintr(void *arg)
+{
 	int c = mfpr(PR_RXCD);
 	if (c == 0)
 		return;
 #if defined(MULTIPROCESSOR)
 	if ((c & 0xff) == 0) {
 		if (curcpu()->ci_flags & CI_MASTERCPU)
 			ka6400_cnintr();
 		return;
+	}
 	if (expect == ((c >> 8) & 0xf))
 		rxbuf[got++] = c & 0xff;
 	if (got == RXBUF)
 		got = 0;
 #endif
+}
 #endif
 /*
  * From ka670, which has the same cache structure.
  */
 static void
 ka6400_enable_cache(void)
+{
 	mtpr(KA670_PCS_REFRESH, PR_PCSTS);	/* disable primary cache */
 	mtpr(mfpr(PR_PCSTS), PR_PCSTS);		/* clear error flags */
 	mtpr(8, PR_BCCTL);			/* disable backup cache */
 	mtpr(0, PR_BCFBTS);	/* flush backup cache tag store */
 	mtpr(0, PR_BCFPTS);	/* flush primary cache tag store */
 	mtpr(0x0e, PR_BCCTL);	/* enable backup cache */
 	mtpr(KA670_PCS_FLUSH | KA670_PCS_REFRESH, PR_PCSTS);	/* flush primary cache */
 	mtpr(KA670_PCS_ENABLE | KA670_PCS_REFRESH, PR_PCSTS);	/* flush primary cache */
+}
 void
 ka6400_steal_pages(void)
+{
 	int i, ncpus;
 	ka6400_enable_cache(); /* Turn on cache early */
 	if (cca == 0)
 		cca = (void *)rpb.cca_addr;
 	/* Is there any way to get number of CPUs easier??? */
 	for (i = ncpus = 0; i < cca->cca_maxcpu; i++)
 		if (cca->cca_console & (1 << i))
 			ncpus++;
 	sprintf(cpu_model, "VAX 6000/4%x0", ncpus + 1);
+}
 #if defined(MULTIPROCESSOR)
 int
 rxchar(void)
+{
 	int ret;
 	if (got == taken)
 		return 0;
 	ret = rxbuf[taken++];
 	if (taken == RXBUF)
 		taken = 0;
 	return ret;
+}
 static void
 ka6400_startslave(struct cpu_info *ci)
+{
 	const struct pcb *pcb = lwp_getpcb(ci->ci_data.cpu_onproc);
 	const int id = ci->ci_slotid;
 	int i;
 	expect = id;
 	/* First empty queue */
 	for (i = 0; i < 10000; i++)
 		if (rxchar())
 			i = 0;
 	ka6400_txrx(id, "\020", 0);		/* Send ^P to get attention */
 	ka6400_txrx(id, "I\r", 0);			/* Init other end */
 	ka6400_txrx(id, "D/I 4 %x\r", ci->ci_istack);	/* Interrupt stack */
 	ka6400_txrx(id, "D/I C %x\r", mfpr(PR_SBR));	/* SBR */
 	ka6400_txrx(id, "D/I D %x\r", mfpr(PR_SLR));	/* SLR */
 	ka6400_txrx(id, "D/I 10 %x\r", pcb->pcb_paddr);	/* PCB for idle proc */
 	ka6400_txrx(id, "D/I 11 %x\r", mfpr(PR_SCBB));	/* SCB */
 	ka6400_txrx(id, "D/I 38 %x\r", mfpr(PR_MAPEN)); /* Enable MM */
 	ka6400_txrx(id, "S %x\r", (int)&vax_mp_tramp); /* Start! */
 	expect = 0;
 	for (i = 0; i < 10000; i++)
 		if (ci->ci_flags & CI_RUNNING)
 			break;
 	if (i == 10000)
 		aprint_error_dev(ci->ci_dev, "(ID %d) failed starting!\n", id);
+}
 void
 ka6400_txrx(int id, const char *fmt, int arg)
+{
 	char buf[20];
 	sprintf(buf, fmt, arg);
 	ka6400_sendstr(id, buf);
 	ka6400_sergeant(id);
+}
 void
 ka6400_sendstr(int id, const char *buf)
+{
 	u_int utchr;
 	int ch, i;
 	while (*buf) {
 		utchr = *buf | id << 8;
 		/*
 		 * It seems like mtpr to TXCD sets the V flag if it fails.
 		 * Cannot check that flag in C...
 		 */
 		__asm("1:;mtpr %0,$92;bvs 1b" :: "g"(utchr));
 		buf++;
 		i = 30000;
 		while ((ch = rxchar()) == 0 && --i)
+			;
 		if (ch == 0)
 			continue; /* failed */
+	}
+}
 void
 ka6400_sergeant(int id)
+{
 	int i, ch, nserg;
 	nserg = 0;
 	for (i = 0; i < 30000; i++) {
 		if ((ch = rxchar()) == 0)
 			continue;
 		if (ch == '>')
 			nserg++;
 		else
 			nserg = 0;
 		i = 0;
 		if (nserg == 3)
 			break;
+	}
 	/* What to do now??? */
+}
 /*
  * Write to master console.
  * Need no locking here; done in the print functions.
  */
 static volatile int ch = 0;
 void
 ka6400_putc(int c)
+{
 	if (curcpu()->ci_flags & CI_MASTERCPU) {
 		gencnputc(0, c);
 		return;
+	}
 	ch = c;
 	mtpr(mastercpu << 8, PR_RXCD); /* Send IPI to mastercpu */
 	while (ch != 0)
 		; /* Wait for master to handle */
+}
 /*
  * Got character IPI.
  */
 void
 ka6400_cnintr(void)
+{
 	if (ch != 0)
 		gencnputc(0, ch);
 	ch = 0; /* Release slavecpu */
+}
 #endif

 @@ -1,484 +1,484 @@
-/*	$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
  *    must display the following acknowledgement:
  *	This product includes software developed at Ludd, University of
  *	Lule}, Sweden and its contributors.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * 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>
 #include <machine/clock.h>
 #include <machine/scb.h>
 #include <machine/sid.h>
 #include <machine/rpb.h>
 #include <machine/ka88.h>
 #include <dev/cons.h>
 #include <vax/vax/gencons.h>
 #include "ioconf.h"
 #include "locators.h"
 static void ka88_memerr(void);
 static void ka88_conf(void);
 static int ka88_mchk(void *);
 static void ka88_steal_pages(void);
 static int ka88_gettime(volatile struct timeval *);
 static void ka88_settime(volatile struct timeval *);
 static void ka88_badaddr(void);
 static long *ka88_mcl;
 static int mastercpu;
 static const char * const ka88_devs[] = { "nmi", NULL };
 const struct cpu_dep ka88_calls = {
 	.cpu_steal_pages = ka88_steal_pages,
 	.cpu_mchk	= ka88_mchk,
 	.cpu_memerr	= ka88_memerr,
 	.cpu_conf	= ka88_conf,
 	.cpu_gettime	= ka88_gettime,
 	.cpu_settime	= ka88_settime,
 	.cpu_vups	= 6,	/* ~VUPS */
 	.cpu_scbsz	= 64,	/* SCB pages */
 	.cpu_devs	= ka88_devs,
 	.cpu_badaddr	= ka88_badaddr,
 };
 #if defined(MULTIPROCESSOR)
 static void ka88_startslave(struct cpu_info *);
 static void ka88_txrx(int, const char *, int);
 static void ka88_sendstr(int, const char *);
 static void ka88_sergeant(int);
 static int rxchar(void);
 static void ka88_putc(int);
 static void ka88_cnintr(void);
 cons_decl(gen);
 const struct cpu_mp_dep ka88_mp_calls = {
 	.cpu_startslave = ka88_startslave,
 	.cpu_cnintr = ka88_cnintr,
 };
 #endif
 static void
 ka88_conf(void)
+{
 	ka88_mcl = (void *)vax_map_physmem(0x3e000000, 1);
 	printf("Serial number %d, rev %d\n",
 	    mfpr(PR_SID) & 65535, (mfpr(PR_SID) >> 16) & 127);
 #ifdef MULTIPROCESSOR
 	mp_dep_call = &ka88_mp_calls;
 #endif
+}
 static int
 ka88_cpu_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 >= 20)
 		return 1;
 	return 0;
+}
 static void
 ka88_cpu_attach(device_t parent, device_t self, void *aux)
+{
 	struct cpu_info *ci;
 	struct nmi_attach_args * const na = aux;
 	const char *ms, *lr;
 	const bool master = (na->na_slot == mastercpu);
 	if (((ka88_confdata & KA88_LEFTPRIM) && master) ||
 	    ((ka88_confdata & KA88_LEFTPRIM) == 0 && !master))
 		lr = "left";
 	else
 		lr = "right";
 	ms = (master ? "master" : "slave");
 	aprint_normal(": KA88 %s %s\n", lr, ms);
 	if (!master) {
 #if defined(MULTIPROCESSOR)
 		v_putc = ka88_putc;	/* Need special console handling */
 		cpu_slavesetup(self, na->na_slot);
 #endif
 		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)
 		return 0;
 	return 1;
+}
 static void
 ms88_attach(device_t parent, device_t self, void *aux)
+{
 	struct nmi_attach_args * const na = aux;
 	struct mem_nmi_softc * const sc = device_private(self);
 	aprint_normal("\n");
 	sc->sc_dev = self;
 	sc->sc_iot = na->na_iot;
+}
 CFATTACH_DECL_NEW(mem_nmi, sizeof(struct mem_nmi_softc),
     ms88_match, ms88_attach, NULL, NULL);
 static void
 ka88_badaddr(void)
+{
 	volatile int hej;
 	/*
 	 * This is some magic to clear the NMI faults, described
 	 * in section 7.9 in the VAX 8800 System Maintenance Guide.
 	 */
 	hej = ka88_mcl[5];
 	hej = ka88_mcl[0];
 	ka88_mcl[0] = 0x04000000;
 	mtpr(1, 0x88);
+}
 static void
 ka88_memerr(void)
+{
 	printf("ka88_memerr\n");
+}
 struct mc88frame {
 	int	mc64_summary;		/* summary parameter */
 	int	mc64_va;		/* va register */
 	int	mc64_vb;		/* memory address */
 	int	mc64_sisr;		/* status word */
 	int	mc64_state;		/* error pc */
 	int	mc64_sc;		/* micro pc */
 	int	mc64_pc;		/* current pc */
 	int	mc64_psl;		/* current psl */
 };
 static int
 ka88_mchk(void *cmcf)
+{
 	return (MCHK_PANIC);
+}
 #if defined(MULTIPROCESSOR)
 #define RXBUF	80
 static char rxbuf[RXBUF];
 static int got = 0, taken = 0;
 static int expect = 0;
 #endif
 #if 0
 /*
  * Receive a character from logical console.
  */
 static void
 rxcdintr(void *arg)
+{
 	int c = mfpr(PR_RXCD);
 	if (c == 0)
 		return;
 #if defined(MULTIPROCESSOR)
 	if ((c & 0xff) == 0) {
 		if (curcpu()->ci_flags & CI_MASTERCPU)
 			ka88_cnintr();
 		return;
+	}
 	if (expect == ((c >> 8) & 0xf))
 		rxbuf[got++] = c & 0xff;
 	if (got == RXBUF)
 		got = 0;
 #endif
+}
 #endif
 static void
 tocons(int val)
+{
 	int s = splhigh();
 	while ((mfpr(PR_TXCS) & GC_RDY) == 0)  /* Wait until xmit ready */
+		;
 	mtpr(val, PR_TXDB);		/* xmit character */
 	splx(s);
+}
 static int
 fromcons(int func)
+{
 	int ret, s = splhigh();
 	while (1) {
 		while ((mfpr(PR_RXCS) & GC_DON) == 0)
+			;
 		ret = mfpr(PR_RXDB);
 		if ((ret & 0xf00) == func)
 			break;
+	}
 	splx(s);
 	return ret;
+}
 static int
 ka88_gettime(volatile struct timeval *tvp)
+{
 	union {u_int ret;u_char r[4];} u;
 	int i, s = splhigh();
 	tocons(KA88_COMM|KA88_TOYREAD);
 	for (i = 0; i < 4; i++) {
 		u.r[i] = fromcons(KA88_TOY) & 255;
+	}
 	splx(s);
 	tvp->tv_sec = u.ret;
 	return 0;
+}
 static void
 ka88_settime(volatile struct timeval *tvp)
+{
 	union {u_int ret;u_char r[4];} u;
 	int i, s = splhigh();
 	u.ret = tvp->tv_sec - yeartonum(numtoyear(tvp->tv_sec));
 	tocons(KA88_COMM|KA88_TOYWRITE);
 	for (i = 0; i < 4; i++)
 		tocons(KA88_TOY|u.r[i]);
 	splx(s);
+}
 void
 ka88_steal_pages(void)
+{
 	mtpr(1, PR_COR); /* Cache on */
 	strcpy(cpu_model, "VAX 8800");
 	tocons(KA88_COMM|KA88_GETCONF);
 	ka88_confdata = fromcons(KA88_CONFDATA);
 	ka88_confdata = mfpr(PR_RXDB);
 	mastercpu = 20;
 	if (vax_cputype == VAX_TYP_8NN) {
 		if (ka88_confdata & KA88_SMALL) {
 			cpu_model[5] = '5';
 			if (ka88_confdata & KA88_SLOW) {
 				vax_boardtype = VAX_BTYP_8500;
 				cpu_model[6] = '3';
 			} else {
 				vax_boardtype = VAX_BTYP_8550;
 				cpu_model[6] = '5';
+			}
 		} else if (ka88_confdata & KA88_SINGLE) {
 			vax_boardtype = VAX_BTYP_8700;
 			cpu_model[5] = '7';
+		}
+	}
+}
 #if defined(MULTIPROCESSOR)
 int
 rxchar(void)
+{
 	int ret;
 	if (got == taken)
 		return 0;
 	ret = rxbuf[taken++];
 	if (taken == RXBUF)
 		taken = 0;
 	return ret;
+}
 static void
 ka88_startslave(struct cpu_info *ci)
+{
 	const struct pcb *pcb = lwp_getpcb(ci->ci_data.cpu_onproc);
 	const int id = ci->ci_slotid;
 	int i;
 	expect = id;
 	/* First empty queue */
 	for (i = 0; i < 10000; i++)
 		if (rxchar())
 			i = 0;
 	ka88_txrx(id, "\020", 0);		/* Send ^P to get attention */
 	ka88_txrx(id, "I\r", 0);			/* Init other end */
 	ka88_txrx(id, "D/I 4 %x\r", ci->ci_istack);	/* Interrupt stack */
 	ka88_txrx(id, "D/I C %x\r", mfpr(PR_SBR));	/* SBR */
 	ka88_txrx(id, "D/I D %x\r", mfpr(PR_SLR));	/* SLR */
 	ka88_txrx(id, "D/I 10 %x\r", pcb->pcb_paddr);	/* PCB for idle proc */
 	ka88_txrx(id, "D/I 11 %x\r", mfpr(PR_SCBB));	/* SCB */
 	ka88_txrx(id, "D/I 38 %x\r", mfpr(PR_MAPEN)); /* Enable MM */
 	ka88_txrx(id, "S %x\r", (int)&vax_mp_tramp); /* Start! */
 	expect = 0;
 	for (i = 0; i < 10000; i++)
 		if (ci->ci_flags & CI_RUNNING)
 			break;
 	if (i == 10000)
 		aprint_error_dev(ci->ci_dev, "(ID %d) failed starting!!\n", id);
+}
 void
 ka88_txrx(int id, const char *fmt, int arg)
+{
 	char buf[20];
 	sprintf(buf, fmt, arg);
 	ka88_sendstr(id, buf);
 	ka88_sergeant(id);
+}
 void
 ka88_sendstr(int id, const char *buf)
+{
 	u_int utchr; /* Ends up in R11 with PCC */
 	int ch, i;
 	while (*buf) {
 		utchr = *buf | id << 8;
 		/*
 		 * It seems like mtpr to TXCD sets the V flag if it fails.
 		 * Cannot check that flag in C...
 		 */
 #ifdef __GNUC__
 		__asm("1:;mtpr %0,$92;bvs 1b" :: "g"(utchr));
 #else
 		__asm("1:;mtpr r11,$92;bvs 1b");
 #endif
 		buf++;
 		i = 30000;
 		while ((ch = rxchar()) == 0 && --i)
+			;
 		if (ch == 0)
 			continue; /* failed */
+	}
+}
 void
 ka88_sergeant(int id)
+{
 	int i, ch, nserg;
 	nserg = 0;
 	for (i = 0; i < 30000; i++) {
 		if ((ch = rxchar()) == 0)
 			continue;
 		if (ch == '>')
 			nserg++;
 		else
 			nserg = 0;
 		i = 0;
 		if (nserg == 3)
 			break;
+	}
 	/* What to do now??? */
+}
 /*
  * Write to master console.
  * Need no locking here; done in the print functions.
  */
 static volatile int ch = 0;
 void
 ka88_putc(int c)
+{
 	if (curcpu()->ci_flags & CI_MASTERCPU) {
 		gencnputc(0, c);
 		return;
+	}
 	ch = c;
 	mtpr(mastercpu << 8, PR_RXCD); /* Send IPI to mastercpu */
 	while (ch != 0)
 		; /* Wait for master to handle */
+}
 /*
  * Got character IPI.
  */
 void
 ka88_cnintr(void)
+{
 	if (ch != 0)
 		gencnputc(0, ch);
 	ch = 0; /* Release slavecpu */
+}
 #endif

 @@ -1,204 +1,204 @@
-/*	$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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)ka730.c	7.4 (Berkeley) 5/9/91
  *	@(#)autoconf.c	7.20 (Berkeley) 5/9/91
  */
 /*
  * 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)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>
 #include "locators.h"
 void	ctuattach(void);
 static	void ka730_clrf(void);
 static	void ka730_conf(void);
 static	void ka730_memerr(void);
 static	int ka730_mchk(void *t);
 static	void ka730_attach_cpu(device_t);
 static const char * const ka730_devs[] = { "cpu", "ubi", NULL };
 struct	cpu_dep ka730_calls = {
 	.cpu_mchk	= ka730_mchk,
 	.cpu_memerr	= ka730_memerr,
 	.cpu_conf	= ka730_conf,
 	.cpu_gettime	= generic_gettime,
 	.cpu_settime	= generic_settime,
 	.cpu_vups	= 1,	/* ~VUPS */
 	.cpu_scbsz	= 4,	/* SCB pages */
 	.cpu_clrf	= ka730_clrf,
 	.cpu_devs	= ka730_devs,
 	.cpu_attach_cpu	= ka730_attach_cpu,
 };
 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"};
 struct mc730frame {
 	int	mc3_bcnt;		/* byte count == 0xc */
 	int	mc3_summary;		/* summary parameter (as above) */
 	int	mc3_parm[2];		/* parameters */
 	int	mc3_pc;			/* trapped pc */
 	int	mc3_psl;		/* trapped psl */
 };
 int
 ka730_mchk(void *cmcf)
+{
 	register struct mc730frame *mcf = (struct mc730frame *)cmcf;
 	register int type = mcf->mc3_summary;
 	printf("machine check %x: %s\n",
 	       type, type < NMC730 ? mc730[type] : "???");
 	printf("\tparams %x %x pc %x psl %x mcesr %x\n",
 	       mcf->mc3_parm[0], mcf->mc3_parm[1],
 	       mcf->mc3_pc, mcf->mc3_psl, mfpr(PR_MCESR));
 	mtpr(0xf, PR_MCESR);
 	return (MCHK_PANIC);
+}
 void
 ka730_clrf()
+{
 	int s = splhigh();
 #define WAIT	while ((mfpr(PR_TXCS) & GC_RDY) == 0) ;
 	WAIT;
 	mtpr(GC_CWFL|GC_CONS, PR_TXDB);
 	WAIT;
 	mtpr(GC_CCFL|GC_CONS, PR_TXDB);
 	WAIT;
 	splx(s);
+}

 @@ -1,658 +1,658 @@
-/*	$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
  *    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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)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>
 #include <machine/clock.h>
 #include <machine/scb.h>
 #include <machine/mainbus.h>
 #include <dev/cons.h>
 #include <dev/bi/bireg.h>
 #include <dev/bi/bivar.h>
 #include <vax/vax/crx.h>
 #include "ioconf.h"
 #include "locators.h"
 struct ka820port *ka820port_ptr;
 struct rx50device *rx50device_ptr;
 static volatile struct ka820clock *ka820_clkpage;
 static int mastercpu;
 static int ka820_match(device_t, cfdata_t, void *);
 static void ka820_attach(device_t, device_t, void*);
 static void ka820_memerr(void);
 static void ka820_conf(void);
 static int ka820_mchk(void *);
 static int ka820_gettime(struct timeval *);
 static void ka820_settime(struct timeval *);
 static void rxcdintr(void *);
 static void vaxbierr(void *);
 static const char * const ka820_devs[] = { "bi", NULL };
 const struct cpu_dep ka820_calls = {
 	.cpu_mchk	= ka820_mchk,
 	.cpu_memerr	= ka820_memerr,
 	.cpu_conf	= ka820_conf,
 	.cpu_gettime	= ka820_gettime,
 	.cpu_settime	= ka820_settime,
 	.cpu_devs	= ka820_devs,
 	.cpu_vups	= 3,      /* ~VUPS */
 	.cpu_scbsz	= 5,	/* SCB pages */
 };
 #if defined(MULTIPROCESSOR)
 static void ka820_startslave(struct cpu_info *);
 static void ka820_send_ipi(struct cpu_info *);
 static void ka820_txrx(int, const char *, int);
 static void ka820_sendstr(int, const char *);
 static void ka820_sergeant(int);
 static int rxchar(void);
 static void ka820_putc(int);
 static void ka820_cnintr(void);
 static void ka820_ipintr(void *);
 cons_decl(gen);
 const struct cpu_mp_dep ka820_mp_dep = {
 	.cpu_startslave	= ka820_startslave,
 	.cpu_send_ipi	= ka820_send_ipi,
 	.cpu_cnintr	= ka820_cnintr,
 };
 #endif
 CFATTACH_DECL_NEW(cpu_bi, 0,
     ka820_match, ka820_attach, NULL, NULL);
 #ifdef notyet
 extern struct pte BRAMmap[];
 extern struct pte EEPROMmap[];
 char bootram[KA820_BRPAGES * VAX_NBPG];
 char eeprom[KA820_EEPAGES * VAX_NBPG];
 #endif
 static int
 ka820_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_KA820)
 		return 0;
 	if (cf->cf_loc[BICF_NODE] != BICF_NODE_DEFAULT &&
 	    cf->cf_loc[BICF_NODE] != ba->ba_nodenr)
 		return 0;
 	return 1;
+}
 static void
 ka820_attach(device_t parent, device_t self, void *aux)
+{
 	struct bi_attach_args * const ba = aux;
 	struct cpu_info *ci;
 	int csr;
 	u_short rev;
 	rev = bus_space_read_4(ba->ba_iot, ba->ba_ioh, BIREG_DTYPE) >> 16;
 	mastercpu = mfpr(PR_BINID);
 	strcpy(cpu_model, "VAX 8200");
 	cpu_model[6] = rev & 0x8000 ? '5' : '0';
 	printf(": ka82%c (%s) CPU rev %d, u patch rev %d, sec patch %d\n",
 	    cpu_model[6], mastercpu == ba->ba_nodenr ? "master" : "slave",
 	    ((rev >> 11) & 15), ((rev >> 1) &1023), rev & 1);
 	/* Allow for IPINTR */
 	bus_space_write_4(ba->ba_iot, ba->ba_ioh,
 	    BIREG_IPINTRMSK, BIIPINTR_MASK);
 #if defined(MULTIPROCESSOR)
 	if (ba->ba_nodenr != mastercpu) {
 		v_putc = ka820_putc;	/* Need special console handling */
 		cpu_slavesetup(self, ba->ba_nodenr);
 		return;
+	}
 #endif
 	ci = curcpu();
 	self->dv_private = ci;	/* eww. but curcpu() is already too */
 				/* entrenched to change */
 	ci->ci_slotid = ba->ba_nodenr;
 	ci->ci_cpuid = device_unit(self);
 	ci->ci_dev = self;
 #if defined(MULTIPROCESSOR)
 	/*
 	 * Catch interprocessor interrupts.
 	 */
 	scb_vecalloc(KA820_INT_IPINTR, ka820_ipintr, ci, SCB_ISTACK, NULL);
 #endif
 	/* reset the console and enable the RX50 */
 	ka820port_ptr = (void *)vax_map_physmem(KA820_PORTADDR, 1);
 	csr = ka820port_ptr->csr;
 	csr &= ~KA820PORT_RSTHALT;	/* ??? */
 	csr |= KA820PORT_CONSCLR | KA820PORT_CRDCLR | KA820PORT_CONSEN |
 		KA820PORT_RXIE;
 	ka820port_ptr->csr = csr;
 	bus_space_write_4(ba->ba_iot, ba->ba_ioh,
 	    BIREG_INTRDES, ba->ba_intcpu);
 	bus_space_write_4(ba->ba_iot, ba->ba_ioh, BIREG_VAXBICSR,
 	    bus_space_read_4(ba->ba_iot, ba->ba_ioh, BIREG_VAXBICSR) |
 	    BICSR_SEIE | BICSR_HEIE);
+}
 void
 ka820_conf(void)
+{
 	/*
 	 * Setup parameters necessary to read time from clock chip.
 	 */
 	ka820_clkpage = (void *)vax_map_physmem(KA820_CLOCKADDR, 1);
 	/* Enable cache */
 	mtpr(0, PR_CADR);
 	/* Steal the interrupt vectors that are unique for us */
 	scb_vecalloc(KA820_INT_RXCD, rxcdintr, NULL, SCB_ISTACK, NULL);
 	scb_vecalloc(0x50, vaxbierr, NULL, SCB_ISTACK, NULL);
 	/* XXX - should be done somewhere else */
 	scb_vecalloc(SCB_RX50, crxintr, NULL, SCB_ISTACK, NULL);
 	rx50device_ptr = (void *)vax_map_physmem(KA820_RX50ADDR, 1);
 #if defined(MULTIPROCESSOR)
 	mp_dep_call = &ka820_mp_dep;
 #endif
+}
 void
 vaxbierr(void *arg)
+{
 	if (cold == 0)
 		panic("vaxbierr");
+}
 #ifdef notdef
 /*
  * MS820 support.
  */
 struct ms820regs {
 	struct	biiregs biic;		/* BI interface chip */
 	u_long	ms_gpr[4];		/* the four gprs (unused) */
 	int	ms_csr1;		/* control/status register 1 */
 	int	ms_csr2;		/* control/status register 2 */
 };
 #endif
 #define	MEMRD(reg) bus_space_read_4(sc->sc_iot, sc->sc_ioh, (reg))
 #define MEMWR(reg, val) bus_space_write_4(sc->sc_iot, sc->sc_ioh, (reg), (val))
 #define	MSREG_CSR1	0x100
 #define	MSREG_CSR2	0x104
 /*
  * Bits in CSR1.
  */
 #define MS1_ERRSUM	0x80000000	/* error summary (ro) */
 #define MS1_ECCDIAG	0x40000000	/* ecc diagnostic (rw) */
 #define MS1_ECCDISABLE	0x20000000	/* ecc disable (rw) */
 #define MS1_MSIZEMASK	0x1ffc0000	/* mask for memory size (ro) */
 #define MS1_RAMTYMASK	0x00030000	/* mask for ram type (ro) */
 #define MS1_RAMTY64K	0x00000000	/* 64K chips */
 #define MS1_RAMTY256K	0x00010000	/* 256K chips */
 #define MS1_RAMTY1MB	0x00020000	/* 1MB chips */
 					/* type 3 reserved */
 #define MS1_CRDINH	0x00008000	/* inhibit crd interrupts (rw) */
 #define MS1_MEMVALID	0x00004000	/* memory has been written (ro) */
 #define MS1_INTLK	0x00002000	/* interlock flag (ro) */
 #define MS1_BROKE	0x00001000	/* broken (rw) */
 #define MS1_MBZ		0x00000880	/* zero */
 #define MS1_MWRITEERR	0x00000400	/* rds during masked write (rw) */
 #define MS1_CNTLERR	0x00000200	/* internal timing busted (rw) */
 #define MS1_INTLV	0x00000100	/* internally interleaved (ro) */
 #define MS1_DIAGC	0x0000007f	/* ecc diagnostic bits (rw) */
 /*
  * Bits in CSR2.
  */
 #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)
 		return 0;
 	if (cf->cf_loc[BICF_NODE] != BICF_NODE_DEFAULT &&
 	    cf->cf_loc[BICF_NODE] != ba->ba_nodenr)
 		return 0;
 	return 1;
+}
 static void
 ms820_attach(device_t parent, device_t self, void *aux)
+{
 	struct mem_bi_softc * const sc = device_private(self);
 	struct bi_attach_args * const ba = aux;
 	sc->sc_dev = self;
 	sc->sc_iot = ba->ba_iot;
 	sc->sc_ioh = ba->ba_ioh;
 	if ((MEMRD(BIREG_VAXBICSR) & BICSR_STS) == 0)
 		aprint_error(": failed self test\n");
 	else
 		aprint_normal(": size %dMB, %s chips\n", ((MEMRD(MSREG_CSR1) &
 		    MS1_MSIZEMASK) >> 20), (MEMRD(MSREG_CSR1) & MS1_RAMTYMASK
 		    ? MEMRD(MSREG_CSR1) & MS1_RAMTY256K ? "256K":"1M":"64K"));
 	MEMWR(BIREG_INTRDES, ba->ba_intcpu);
 	MEMWR(BIREG_VAXBICSR, MEMRD(BIREG_VAXBICSR) | BICSR_SEIE | BICSR_HEIE);
 	MEMWR(MSREG_CSR1, MS1_MWRITEERR | MS1_CNTLERR);
 	MEMWR(MSREG_CSR2, MS2_RDSERR | MS2_HIERR | MS2_CRDERR | MS2_ADRSERR);
+}
 static void
 ka820_memerr(void)
+{
 	struct mem_bi_softc *sc;
 	int m, hard, csr1, csr2;
 	const char *type;
 static const char b1[] = "\20\40ERRSUM\37ECCDIAG\36ECCDISABLE\20CRDINH\17VALID\
 \16INTLK\15BROKE\13MWRITEERR\12CNTLERR\11INTLV";
 static const char b2[] = "\20\40RDS\37HIERR\36CRD\35ADRS";
 	char sbuf[sizeof(b1) + 64], sbuf2[sizeof(b2) + 64];
 	for (m = 0; m < mem_cd.cd_ndevs; m++) {
 		sc = device_lookup_private(&mem_cd, m);
 		if (sc == NULL)
 			continue;
 		csr1 = MEMRD(MSREG_CSR1);
 		csr2 = MEMRD(MSREG_CSR2);
 		snprintb(sbuf, sizeof(sbuf), b1, csr1);
 		snprintb(sbuf2, sizeof(sbuf2), b2, csr2);
 		aprint_error_dev(sc->sc_dev, "csr1=%s csr2=%s\n", sbuf, sbuf2);
 		if ((csr1 & MS1_ERRSUM) == 0)
 			continue;
 		hard = 1;
 		if (csr1 & MS1_BROKE)
 			type = "broke";
 		else if (csr1 & MS1_CNTLERR)
 			type = "cntl err";
 		else if (csr2 & MS2_ADRSERR)
 			type = "address parity err";
 		else if (csr2 & MS2_RDSERR)
 			type = "rds err";
 		else if (csr2 & MS2_CRDERR) {
 			hard = 0;
 			type = "";
 		} else
 			type = "mysterious error";
 		aprint_error_dev(sc->sc_dev, "%s%s%s addr %x bank %x syn %x\n",
 		    hard ? "hard error: " : "soft ecc",
 		    type, csr2 & MS2_HIERR ?  " (+ other rds or crd err)" : "",
 		    ((csr2 & MS2_ADDR) + MEMRD(BIREG_SADR)) >> 9,
 		    (csr2 & MS2_INTLVADDR) != 0, csr2 & MS2_SYN);
 		MEMWR(MSREG_CSR1, csr1 | MS1_CRDINH);
 		MEMWR(MSREG_CSR2, csr2);
+	}
+}
 /* these are bits 0 to 6 in the summary field */
 const char * const mc8200[] = {
 	"cpu bad ipl",		"ucode lost err",
 	"ucode par err",	"DAL par err",
 	"BI bus err",		"BTB tag par",
 	"cache tag par",
 };
 #define MC8200_BADIPL	0x01
 #define MC8200_UERR	0x02
 #define MC8200_UPAR	0x04
 #define MC8200_DPAR	0x08
 #define MC8200_BIERR	0x10
 #define MC8200_BTAGPAR	0x20
 #define MC8200_CTAGPAR	0x40
 struct mc8200frame {
 	int	mc82_bcnt;		/* byte count == 0x20 */
 	int	mc82_summary;		/* summary parameter */
 	int	mc82_param1;		/* parameter 1 */
 	int	mc82_va;		/* va register */
 	int	mc82_vap;		/* va prime register */
 	int	mc82_ma;		/* memory address */
 	int	mc82_status;		/* status word */
 	int	mc82_epc;		/* error pc */
 	int	mc82_upc;		/* micro pc */
 	int	mc82_pc;		/* current pc */
 	int	mc82_psl;		/* current psl */
 };
 static int
 ka820_mchk(void *cmcf)
+{
 	struct mc8200frame *mcf = (struct mc8200frame *)cmcf;
 	int i, type = mcf->mc82_summary;
 	/* ignore BI bus errors during configuration */
 	if (cold && type == MC8200_BIERR) {
 		mtpr(PR_MCESR, 0xf);
 		return (MCHK_RECOVERED);
+	}
 	/*
 	 * SOME ERRORS ARE RECOVERABLE
 	 * do it later
 	 */
 	printf("machine check %x: ", type);
 	for (i = 0; i < sizeof (mc8200) / sizeof (mc8200[0]); i++)
 		if (type & (1 << i))
 			printf(" %s,", mc8200[i]);
 	printf(" param1 %x\n", mcf->mc82_param1);
 	printf(
 "\tva %x va' %x ma %x pc %x psl %x\n\tstatus %x errpc %x upc %x\n",
 		mcf->mc82_va, mcf->mc82_vap, mcf->mc82_ma,
 		mcf->mc82_pc, mcf->mc82_psl,
 		mcf->mc82_status, mcf->mc82_epc, mcf->mc82_upc);
 	return (MCHK_PANIC);
+}
 #if defined(MULTIPROCESSOR)
 #define	RXBUF	80
 static char rxbuf[RXBUF];
 static int got = 0, taken = 0;
 static int expect = 0;
 #endif
 /*
  * Receive a character from logical console.
  */
 static void
 rxcdintr(void *arg)
+{
 	int c = mfpr(PR_RXCD);
 	if (c == 0)
 		return;
 #if defined(MULTIPROCESSOR)
 	if (expect == ((c >> 8) & 0xf))
 		rxbuf[got++] = c & 0xff;
 	if (got == RXBUF)
 		got = 0;
 #endif
+}
 #if defined(MULTIPROCESSOR)
 int
 rxchar(void)
+{
 	int ret;
 	if (got == taken)
 		return 0;
 	ret = rxbuf[taken++];
 	if (taken == RXBUF)
 		taken = 0;
 	return ret;
+}
 #endif
 int
 ka820_gettime(struct timeval *tvp)
+{
 	struct clock_ymdhms c;
 	int s;
 	while (ka820_clkpage->csr0 & KA820CLK_0_BUSY)
+		;
 	s = splhigh();
 	c.dt_sec  = ka820_clkpage->sec;
 	c.dt_min  = ka820_clkpage->min;
 	c.dt_hour = ka820_clkpage->hr;
 	c.dt_wday = ka820_clkpage->dayofwk;
 	c.dt_day  = ka820_clkpage->day;
 	c.dt_mon  = ka820_clkpage->mon;
 	c.dt_year = ka820_clkpage->yr;
 	splx(s);
 	/* strange conversion */
 	c.dt_sec  = ((c.dt_sec  << 7) | (c.dt_sec  >> 1)) & 0377;
 	c.dt_min  = ((c.dt_min  << 7) | (c.dt_min  >> 1)) & 0377;
 	c.dt_hour = ((c.dt_hour << 7) | (c.dt_hour >> 1)) & 0377;
 	c.dt_wday = ((c.dt_wday << 7) | (c.dt_wday >> 1)) & 0377;
 	c.dt_day  = ((c.dt_day  << 7) | (c.dt_day  >> 1)) & 0377;
 	c.dt_mon  = ((c.dt_mon  << 7) | (c.dt_mon  >> 1)) & 0377;
 	c.dt_year = ((c.dt_year << 7) | (c.dt_year >> 1)) & 0377;
 	tvp->tv_sec = clock_ymdhms_to_secs(&c);
 	return 0;
+}
 void
 ka820_settime(struct timeval *tvp)
+{
 	struct clock_ymdhms c;
 	clock_secs_to_ymdhms(tvp->tv_sec, &c);
 	ka820_clkpage->csr1    = KA820CLK_1_SET;
 	ka820_clkpage->sec     = ((c.dt_sec  << 1) | (c.dt_sec  >> 7)) & 0377;
 	ka820_clkpage->min     = ((c.dt_min  << 1) | (c.dt_min  >> 7)) & 0377;
 	ka820_clkpage->hr      = ((c.dt_hour << 1) | (c.dt_hour >> 7)) & 0377;
 	ka820_clkpage->dayofwk = ((c.dt_wday << 1) | (c.dt_wday >> 7)) & 0377;
 	ka820_clkpage->day     = ((c.dt_day  << 1) | (c.dt_day  >> 7)) & 0377;
 	ka820_clkpage->mon     = ((c.dt_mon  << 1) | (c.dt_mon  >> 7)) & 0377;
 	ka820_clkpage->yr      = ((c.dt_year << 1) | (c.dt_year >> 7)) & 0377;
 	ka820_clkpage->csr1    = KA820CLK_1_GO;
+}
 #if defined(MULTIPROCESSOR)
 static void
 ka820_startslave(struct cpu_info *ci)
+{
 	const struct pcb *pcb = lwp_getpcb(ci->ci_data.cpu_onproc);
 	const int id = ci->ci_slotid;
 	int i;
 	expect = id;
 	/* First empty queue */
 	for (i = 0; i < 10000; i++)
 		if (rxchar())
 			i = 0;
 	ka820_txrx(id, "\020", 0);		/* Send ^P to get attention */
 	ka820_txrx(id, "I\r", 0);			/* Init other end */
 	ka820_txrx(id, "D/I 4 %x\r", ci->ci_istack);	/* Interrupt stack */
 	ka820_txrx(id, "D/I C %x\r", mfpr(PR_SBR));	/* SBR */
 	ka820_txrx(id, "D/I D %x\r", mfpr(PR_SLR));	/* SLR */
 	ka820_txrx(id, "D/I 10 %x\r", pcb->pcb_paddr);	/* PCB for idle proc */
 	ka820_txrx(id, "D/I 11 %x\r", mfpr(PR_SCBB));	/* SCB */
 	ka820_txrx(id, "D/I 38 %x\r", mfpr(PR_MAPEN));	/* Enable MM */
 	ka820_txrx(id, "S %x\r", (int)&vax_mp_tramp);	/* Start! */
 	expect = 0;
 	for (i = 0; i < 10000; i++)
 		if (ci->ci_flags & CI_RUNNING)
 			break;
 	if (i == 10000)
 		aprint_error_dev(ci->ci_dev, "(ID %d) failed starting??\n", id);
+}
 void
 ka820_txrx(int id, const char *fmt, int arg)
+{
 	char buf[20];
 	sprintf(buf, fmt, arg);
 	ka820_sendstr(id, buf);
 	ka820_sergeant(id);
+}
 static void
 ka820_sendchr(int chr)
+{
 	/*
 	 * It seems like mtpr to TXCD sets the V flag if it fails.
 	 * Cannot check that flag in C...
 	 */
 	__asm volatile("1:;mtpr %0,$92;bvs 1b" :: "g"(chr));
+}
 void
 ka820_sendstr(int id, const char *buf)
+{
 	u_int utchr;
 	int ch, i;
 	while (*buf) {
 		utchr = *buf | id << 8;
 		ka820_sendchr(utchr);
 		buf++;
 		i = 30000;
 		while ((ch = rxchar()) == 0 && --i)
+			;
 		if (ch == 0)
 			continue; /* failed */
+	}
+}
 void
 ka820_sergeant(int id)
+{
 	int i, ch, nserg;
 	nserg = 0;
 	for (i = 0; i < 30000; i++) {
 		if ((ch = rxchar()) == 0)
 			continue;
 		if (ch == '>')
 			nserg++;
 		else
 			nserg = 0;
 		i = 0;
 		if (nserg == 3)
 			break;
+	}
 	/* What to do now??? */
+}
 /*
  * Write to master console.
  */
 static volatile int ch = 0;
 void
 ka820_putc(int c)
+{
 	if (curcpu()->ci_flags & CI_MASTERCPU) {
 		gencnputc(0, c);
 		return;
+	}
 	ch = c;
 	cpu_send_ipi(IPI_DEST_MASTER, IPI_SEND_CNCHAR);
 	while (ch != 0)
 		; /* Wait for master to handle */
+}
 /*
  * Got character IPI.
  */
 void
 ka820_cnintr(void)
+{
 	if (ch != 0)
 		gencnputc(0, ch);
 	ch = 0; /* Release slavecpu */
+}
 void
 ka820_send_ipi(struct cpu_info *ci)
+{
 	mtpr(1 << ci->ci_cpuid, PR_IPIR);
+}
 void
 ka820_ipintr(void *arg)
+{
 	cpu_handle_ipi();
+}
 #endif

 @@ -1,226 +1,226 @@
-/*	$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
  *    must display the following acknowledgement:
  *      This product includes software developed at Ludd, University of
  *      Lule}, Sweden and its contributors.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * 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))) {
 		SIMPLEQ_REMOVE_HEAD(&cpuq, cq_q);
 		(*mp_dep_call->cpu_startslave)(q->cq_ci);
 		free(q, M_TEMP);
+	}
+}
 /*
  * Allocate a cpu_info struct and fill it in then prepare for getting
  * started by cpu_boot_secondary_processors().
  */
 void
 cpu_slavesetup(device_t self, int slotid)
+{
 	struct cpu_info *ci;
 	struct cpuq *cq;
 	struct vm_page *pg;
 	vaddr_t istackbase;
 	KASSERT(device_private(self) == NULL);
 	ci = malloc(sizeof(*ci), M_DEVBUF, M_ZERO|M_NOWAIT);
 	if (ci == NULL)
 		panic("cpu_slavesetup1");
 	self->dv_private = ci;
 	ci->ci_dev = self;
 	ci->ci_slotid = slotid;
 	ci->ci_cpuid = device_unit(self);
 	/* Allocate an interrupt stack */
 	pg = uvm_pagealloc(NULL, 0, NULL, 0);
 	if (pg == NULL)
 		panic("cpu_slavesetup2");
 	istackbase = VM_PAGE_TO_PHYS(pg) | KERNBASE;
 	kvtopte(istackbase)->pg_v = 0; /* istack safety belt */
 	/* Populate the PCB and the cpu_info struct */
 	ci->ci_istack = istackbase + PAGE_SIZE;
 	SIMPLEQ_INSERT_TAIL(&cpus, ci, ci_next);
 	cq = malloc(sizeof(*cq), M_TEMP, M_NOWAIT|M_ZERO);
 	if (cq == NULL)
 		panic("cpu_slavesetup3");
 	cq->cq_ci = ci;
 	cq->cq_dev = ci->ci_dev;
 	SIMPLEQ_INSERT_TAIL(&cpuq, cq, cq_q);
 	mi_cpu_attach(ci);	/* let the MI parts know about the new cpu */
+}
 /*
  * Send an IPI of type type to the CPU with logical device number cpu.
  */
 void
 cpu_send_ipi(int cpu, int type)
+{
 	struct cpu_info *ci;
 	int i;
 	if (cpu >= 0) {
 		ci = device_lookup_private(&cpu_cd, cpu);
 		bbssi(type, &ci->ci_ipimsgs);
 		(*mp_dep_call->cpu_send_ipi)(ci);
 		return;
+	}
 	for (i = 0; i < cpu_cd.cd_ndevs; i++) {
 		ci = device_lookup_private(&cpu_cd, i);
 		if (ci == NULL)
 			continue;
 		switch (cpu) {
 		case IPI_DEST_MASTER:
 			if (ci->ci_flags & CI_MASTERCPU) {
 				bbssi(type, &ci->ci_ipimsgs);
 				(*mp_dep_call->cpu_send_ipi)(ci);
+			}
 			break;
 		case IPI_DEST_ALL:
 			if (i == cpu_number())
 				continue;	/* No IPI to myself */
 			bbssi(type, &ci->ci_ipimsgs);
 			(*mp_dep_call->cpu_send_ipi)(ci);
 			break;
+		}
+	}
+}
 void
 cpu_handle_ipi(void)
+{
 	struct cpu_info * const ci = curcpu();
 	int bitno;
 	int s;
 	s = splhigh();
 	while ((bitno = ffs(ci->ci_ipimsgs))) {
 		bitno -= 1; /* ffs() starts from 1 */
 		bbcci(bitno, &ci->ci_ipimsgs);
 		switch (bitno) {
 		case IPI_START_CNTX:
 #ifdef DIAGNOSTIC
 			if (CPU_IS_PRIMARY(ci) == 0)
 				panic("cpu_handle_ipi");
 #endif
 			gencnstarttx();
 			break;
 		case IPI_SEND_CNCHAR:
 #ifdef DIAGNOSTIC
 			if (CPU_IS_PRIMARY(ci) == 0)
 				panic("cpu_handle_ipi2");
 #endif
 			(*mp_dep_call->cpu_cnintr)();
 			break;
 		case IPI_RUNNING:
 			break;
 		case IPI_TBIA:
 			mtpr(0, PR_TBIA);
 			break;
 		case IPI_DDB:
 			Debugger();
 			break;
 		case IPI_XCALL:
 			xc_ipi_handler();
 			break;
 		default:
 			panic("cpu_handle_ipi: bad bit %x", bitno);
+		}
+	}
 	splx(s);
+}
 /*
  * MD support for xcall(9) interface.
  */
 void
 xc_send_ipi(struct cpu_info *ci)
+{
 	KASSERT(kpreempt_disabled());
 	KASSERT(curcpu() != ci);
 	if (ci) {
 		/* Unicast: remote CPU. */
 		cpu_send_ipi(ci->ci_cpuid, IPI_XCALL);
 	} else {
 		/* Broadcast: all, but local CPU (caller will handle it). */
 		cpu_send_ipi(IPI_DEST_ALL, IPI_XCALL);
+	}
+}

 @@ -1,119 +1,119 @@
-/*	$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
  *    must display the following acknowledgement:
  *	This product includes software developed at Ludd, University of
  *	Lule}, Sweden and its contributors.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: 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.
 	 */
 	for (sa.sa_nexnum = 0; sa.sa_nexnum < 4; sa.sa_nexnum++) {
 		sa.sa_ioh = vax_map_physmem(NEX730 +
 		    sizeof(struct nexus) * sa.sa_nexnum, NEXPAGES);
 		if (badaddr((caddr_t)sa.sa_ioh, 4)) {
 			vax_unmap_physmem((vaddr_t)sa.sa_ioh, NEXPAGES);
 		} else {
 			sa.sa_type = NEX_MEM16;
 			config_found(self, (void*)&sa, ubi_print);
+		}
+	}
 #endif
 	/* VAX 730 fixed configuration */
 	/* memory */
 	sa.sa_nexnum = 0;
 	sa.sa_ioh = vax_map_physmem((int)NEX730 +
 	   sizeof(struct nexus) * sa.sa_nexnum, NEXPAGES);
 	sa.sa_type = NEX_MEM16;
 	config_found(self, (void*)&sa, ubi_print);
 	printf("\n");
 	/* generic UBA */
 	sa.sa_nexnum = 3;
 	sa.sa_ioh = vax_map_physmem((int)NEX730 +
 	    sizeof(struct nexus) * sa.sa_nexnum, NEXPAGES);
 	sa.sa_type = NEX_UBA0;
 	config_found(self, (void*)&sa, ubi_print);
+}