 @@ -1,14 +1,14 @@
-/* $NetBSD: sbmac.c,v 1.28.24.2 2009/11/23 18:28:46 matt Exp $ */
+/* $NetBSD: sbmac.c,v 1.28.24.3 2009/11/23 18:46:50 matt Exp $ */
 /*
  * Copyright 2000, 2001, 2004
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -23,27 +23,27 @@
  *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
  *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
  *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
  *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
  *    LIABLE FOR 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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.28.24.2 2009/11/23 18:28:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.28.24.3 2009/11/23 18:46:50 matt Exp $");
 #include "bpfilter.h"
 #include "opt_inet.h"
 #include "opt_ns.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 @@ -242,27 +242,27 @@ static int sbdma_add_rcvbuffer(sbmacdma_
 static int sbdma_add_txbuffer(sbmacdma_t *d, struct mbuf *m);
 static void sbdma_emptyring(sbmacdma_t *d);
 static void sbdma_fillring(sbmacdma_t *d);
 static void sbdma_rx_process(struct sbmac_softc *sc, sbmacdma_t *d);
 static void sbdma_tx_process(struct sbmac_softc *sc, sbmacdma_t *d);
 static void sbmac_initctx(struct sbmac_softc *s);
 static void sbmac_channel_start(struct sbmac_softc *s);
 static void sbmac_channel_stop(struct sbmac_softc *s);
 static sbmac_state_t sbmac_set_channel_state(struct sbmac_softc *,
     sbmac_state_t);
 static void sbmac_promiscuous_mode(struct sbmac_softc *sc, int onoff);
 static void sbmac_init_and_start(struct sbmac_softc *sc);
 static uint64_t sbmac_addr2reg(u_char *ptr);
-static void sbmac_intr(void *xsc, uint32_t status, uint32_t pc);
+static void sbmac_intr(void *xsc, uint32_t status, vaddr_t pc);
 static void sbmac_start(struct ifnet *ifp);
 static void sbmac_setmulti(struct sbmac_softc *sc);
 static int sbmac_ether_ioctl(struct ifnet *ifp, u_long cmd, void *data);
 static int sbmac_ioctl(struct ifnet *ifp, u_long command, void *data);
 static void sbmac_watchdog(struct ifnet *ifp);
 static int sbmac_match(struct device *parent, struct cfdata *match, void *aux);
 static void sbmac_attach(struct device *parent, struct device *self, void *aux);
 static int sbmac_set_speed(struct sbmac_softc *s, sbmac_speed_t speed);
 static int sbmac_set_duplex(struct sbmac_softc *s, sbmac_duplex_t duplex,
     sbmac_fc_t fc);
 static void sbmac_tick(void *arg);
 @@ -1721,27 +1721,27 @@ sbmac_set_duplex(struct sbmac_softc *s,
  *  SBMAC_INTR()
+ *
  *  Interrupt handler for MAC interrupts
+ *
  *  Input parameters:
  *	MAC structure
+ *
  *  Return value:
  *	nothing
  */
 /* ARGSUSED */
 static void
-sbmac_intr(void *xsc, uint32_t status, uint32_t pc)
+sbmac_intr(void *xsc, uint32_t status, vaddr_t pc)
+{
 	struct sbmac_softc *sc = (struct sbmac_softc *) xsc;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	uint64_t isr;
 	for (;;) {
 		/*
 		 * Read the ISR (this clears the bits in the real register)
 		 */
 		isr = SBMAC_READCSR(sc->sbm_isr);

 @@ -1,14 +1,14 @@
-/* $NetBSD: sbscn.c,v 1.27.14.1 2009/11/23 18:28:47 matt Exp $ */
+/* $NetBSD: sbscn.c,v 1.27.14.2 2009/11/23 18:46:50 matt Exp $ */
 /*
  * Copyright 2000, 2001
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -99,27 +99,27 @@
+ *
  * This DUART is quite similar in programming model to the scn2681/68681
  * DUARTs supported by the NetBSD/amiga `mfc' and NetBSD/pc532 `scn'
  * driver, but substantial rework would have been necessary to make
  * those drivers sane w.r.t. bus_space (which would then have been
  * required on NetBSD/sbmips very early on), and to accommodate the
  * different register mappings.
+ *
  * So, another driver.  Eventually there should be One True Driver,
  * but we're not here to save the world.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.27.14.1 2009/11/23 18:28:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbscn.c,v 1.27.14.2 2009/11/23 18:46:50 matt Exp $");
 #define	SBSCN_DEBUG
 #include "opt_ddb.h"
 #include "rnd.h"
 #if NRND > 0 && defined(RND_SBSCN)
 #include <sys/rnd.h>
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 @@ -160,27 +160,27 @@ void	sbscn_start(struct tty *);
 int	sbscn_hwiflow(struct tty *, int);
 void	sbscn_loadchannelregs(struct sbscn_channel *);
 void	sbscn_dohwiflow(struct sbscn_channel *);
 void	sbscn_break(struct sbscn_channel *, int);
 void	sbscn_modem(struct sbscn_channel *, int);
 void	tiocm_to_sbscn(struct sbscn_channel *, int, int);
 int	sbscn_to_tiocm(struct sbscn_channel *);
 void	sbscn_iflush(struct sbscn_channel *);
 int	sbscn_init(u_long addr, int chan, int rate, tcflag_t cflag);
 int	sbscn_common_getc(u_long addr, int chan);
 void	sbscn_common_putc(u_long addr, int chan, int c);
-void	sbscn_intr(void *arg, uint32_t status, uint32_t pc);
+void	sbscn_intr(void *arg, uint32_t status, vaddr_t pc);
 int	sbscn_cngetc(dev_t dev);
 void	sbscn_cnputc(dev_t dev, int c);
 void	sbscn_cnpollc(dev_t dev, int on);
 extern struct cfdriver sbscn_cd;
 dev_type_open(sbscnopen);
 dev_type_close(sbscnclose);
 dev_type_read(sbscnread);
 dev_type_write(sbscnwrite);
 dev_type_ioctl(sbscnioctl);
 dev_type_stop(sbscnstop);
 @@ -1461,27 +1461,27 @@ sbscn_soft(void *arg)
 	if (ch->ch_st_check) {
 		ch->ch_st_check = 0;
 		sbscn_stsoft(ch, tp);
+	}
 	if (ch->ch_tx_done) {
 		ch->ch_tx_done = 0;
 		sbscn_txsoft(ch, tp);
+	}
+}
 void
-sbscn_intr(void *arg, uint32_t status, uint32_t pc)
+sbscn_intr(void *arg, uint32_t status, vaddr_t pc)
+{
 	struct sbscn_channel *ch = arg;
 	u_char *put, *end;
 	u_int cc;
 	u_char isr, sr;
 	/* read ISR */
 	isr = READ_REG(ch->ch_isr_base) & ch->ch_imr;
 	if (isr == 0)
 		return;
 	end = ch->ch_ebuf;
 	put = ch->ch_rbput;

 @@ -1,14 +1,14 @@
-/* $NetBSD: sbtimer.c,v 1.13.28.1 2009/11/23 18:28:47 matt Exp $ */
+/* $NetBSD: sbtimer.c,v 1.13.28.2 2009/11/23 18:46:50 matt Exp $ */
 /*
  * Copyright 2000, 2001
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -23,27 +23,27 @@
  *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
  *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
  *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
  *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
  *    LIABLE FOR 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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbtimer.c,v 1.13.28.1 2009/11/23 18:28:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbtimer.c,v 1.13.28.2 2009/11/23 18:46:50 matt Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <mips/locore.h>
 #include <mips/sibyte/include/sb1250_regs.h>
 #include <mips/sibyte/include/sb1250_scd.h>
 #include <mips/sibyte/dev/sbscdvar.h>
 struct sbtimer_softc {
 @@ -54,50 +54,49 @@ struct sbtimer_softc {
 };
 #define	SBTIMER_CLOCK		1
 #define	SBTIMER_STATCLOCK	2
 #define	READ_REG(rp)		(mips3_ld((volatile uint64_t *)(rp)))
 #define	WRITE_REG(rp, val)	(mips3_sd((volatile uint64_t *)(rp), (val)))
 static int	sbtimer_match(struct device *, struct cfdata *, void *);
 static void	sbtimer_attach(struct device *, struct device *, void *);
 CFATTACH_DECL(sbtimer, sizeof(struct sbtimer_softc),
     sbtimer_match, sbtimer_attach, NULL, NULL);
-static void	sbtimer_clockintr(void *arg, uint32_t status, uint32_t pc);
+static void	sbtimer_clockintr(void *arg, uint32_t status, vaddr_t pc);
-static void	sbtimer_statclockintr(void *arg, uint32_t status,
+static void	sbtimer_statclockintr(void *arg, uint32_t status, vaddr_t pc);
-		    uint32_t pc);
+static void	sbtimer_miscintr(void *arg, uint32_t status, vaddr_t pc);
 static void	sbtimer_miscintr(void *arg, uint32_t status, uint32_t pc);
 static void	sbtimer_clock_init(void *arg);
 static int
 sbtimer_match(struct device *parent, struct cfdata *match, void *aux)
+{
 	struct sbscd_attach_args *sap = aux;
 	if (sap->sa_locs.sa_type != SBSCD_DEVTYPE_TIMER)
 		return (0);
 	return 1;
+}
 static void
 sbtimer_attach(struct device *parent, struct device *self, void *aux)
+{
 	struct sbscd_attach_args *sa = aux;
 	struct sbtimer_softc *sc = (struct sbtimer_softc *)self;
-	void (*fun)(void *, uint32_t, uint32_t);
+	void (*fun)(void *, uint32_t, vaddr_t);
 	int ipl;
 	const char *comment = "";
 	sc->sc_flags = device_cfdata(&sc->sc_dev)->cf_flags;
 	sc->sc_addr_icnt = (uint64_t *)MIPS_PHYS_TO_KSEG1(sa->sa_base +
 	    sa->sa_locs.sa_offset + R_SCD_TIMER_INIT);
 	sc->sc_addr_cnt = (uint64_t *)MIPS_PHYS_TO_KSEG1(sa->sa_base +
 	    sa->sa_locs.sa_offset + R_SCD_TIMER_CNT);
 	sc->sc_addr_cfg = (uint64_t *)MIPS_PHYS_TO_KSEG1(sa->sa_base +
 	    sa->sa_locs.sa_offset + R_SCD_TIMER_CFG);
 	printf(": ");
 	if ((sc->sc_flags & SBTIMER_CLOCK) != 0) {
 @@ -154,60 +153,60 @@ sbtimer_clock_init(void *arg)
 	WRITE_REG(sc->sc_addr_cfg, 0x00);		/* XXX */
 	if (G_SYS_PLL_DIV(READ_REG(MIPS_PHYS_TO_KSEG1(A_SCD_SYSTEM_CFG))) == 0) {
 		printf("%s: PLL_DIV == 0; speeding up clock ticks for simulator\n",
 		    sc->sc_dev.dv_xname);
 		WRITE_REG(sc->sc_addr_icnt, (tick/100) - 1); /* XXX */
 	} else {
 		WRITE_REG(sc->sc_addr_icnt, tick - 1);	/* XXX */
+	}
 	WRITE_REG(sc->sc_addr_cfg, 0x03);		/* XXX */
+}
 static void
-sbtimer_clockintr(void *arg, uint32_t status, uint32_t pc)
+sbtimer_clockintr(void *arg, uint32_t status, vaddr_t pc)
+{
 	struct sbtimer_softc *sc = arg;
 	struct clockframe cf;
 	/* clear interrupt, but leave timer enabled and in repeating mode */
 	WRITE_REG(sc->sc_addr_cfg, 0x03);		/* XXX */
 	cf.pc = pc;
 	cf.sr = status;
 	hardclock(&cf);
 	/*
 	 * We never want a CPU core clock interrupt, so adjust the CP0
 	 * compare register to just before the CP0 clock register's value
 	 * each time.
 	 */
 	mips3_cp0_compare_write(mips3_cp0_count_read() - 1);
+}
 static void
-sbtimer_statclockintr(void *arg, uint32_t status, uint32_t pc)
+sbtimer_statclockintr(void *arg, uint32_t status, vaddr_t pc)
+{
 	struct sbtimer_softc *sc = arg;
 	struct clockframe cf;
 	/* clear intr & disable timer, reset initial count, re-enable timer */
 	WRITE_REG(sc->sc_addr_cfg, 0x00);		/* XXX */
 	/* XXX more to do */
 	cf.pc = pc;
 	cf.sr = status;
 	statclock(&cf);
+}
 static void
-sbtimer_miscintr(void *arg, uint32_t status, uint32_t pc)
+sbtimer_miscintr(void *arg, uint32_t status, vaddr_t pc)
+{
 	struct sbtimer_softc *sc = arg;
 	/* disable timer */
 	WRITE_REG(sc->sc_addr_cfg, 0x00);		/* XXX */
 	/* XXX more to do */
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: systemsw.h,v 1.7 2008/01/08 14:38:48 simonb Exp $ */
+/* $NetBSD: systemsw.h,v 1.7.28.1 2009/11/23 18:46:50 matt Exp $ */
 /*
  * Copyright 2000, 2001
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -29,35 +29,35 @@
  *    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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _SBMIPS_SYSTEMSW_H_
 #define	_SBMIPS_SYSTEMSW_H_
 #include <sys/types.h>
 struct systemsw {
 	/* ordered to match likely locality. */
-	void	(*s_cpu_intr)(uint32_t, uint32_t, uint32_t, uint32_t);
+	void	(*s_cpu_intr)(uint32_t, uint32_t, vaddr_t, uint32_t);
 	void	*s_clock_arg;
 	void	(*s_clock_init)(void *);
 	void	*s_statclock_arg;
 	void	(*s_statclock_init)(void *);
 	void	(*s_statclock_setrate)(void *, int);
 	void	*(*s_intr_establish)(u_int, u_int,
-		    void (*fun)(void *, uint32_t, uint32_t), void *);
+		    void (*fun)(void *, uint32_t, vaddr_t), void *);
 };
 extern struct systemsw systemsw;
 int	system_set_clockfns(void *, void (*)(void *));
 int	system_set_todrfns(void *, void (*)(void *, time_t), void (*)(void *));
 #define	cpu_intr_establish(n,s,f,a)	((*systemsw.s_intr_establish)(n,s,f,a))
 void	sb1250_icu_init(void);
 #endif /* _SBMIPS_SYSTEMSW_H_ */

 @@ -1,14 +1,14 @@
-/* $NetBSD: sb1250_icu.c,v 1.9.36.1 2009/11/23 18:28:47 matt Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.9.36.2 2009/11/23 18:46:50 matt Exp $ */
 /*
  * Copyright 2000, 2001
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -23,68 +23,68 @@
  *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
  *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
  *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
  *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
  *    LIABLE FOR 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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.9.36.1 2009/11/23 18:28:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.9.36.2 2009/11/23 18:46:50 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 /* XXX for uvmexp */
 #include <uvm/uvm_extern.h>
 #include <machine/systemsw.h>
 #include <mips/locore.h>
 /* XXX for now, this copes with one cpu only, and assumes it's CPU 0 */
 /* imr values corresponding to each pin */
 uint64_t ints_for_line[6];
 uint64_t imr_all;
 struct sb1250_ihand {
-	void	(*fun)(void *, uint32_t, uint32_t);
+	void	(*fun)(void *, uint32_t, vaddr_t);
 	void	*arg;
 	int	level;
 	struct evcnt count;
 };
 static struct sb1250_ihand sb1250_ihands[64];		/* XXX */
 #define	SB1250_I_IMR_ADDR	(MIPS_PHYS_TO_KSEG1(0x10020000 + 0x0028))
 #define	SB1250_I_IMR_SSTATUS	(MIPS_PHYS_TO_KSEG1(0x10020000 + 0x0040))
 #define	SB1250_I_MAP(x)							\
     (MIPS_PHYS_TO_KSEG1(0x10020000 + 0x0200 + (x) * 8))
 #define	SB1250_I_MAP_I0		0x00
 #define	SB1250_I_MAP_I1		0x01
 #define	SB1250_I_MAP_I2		0x02
 /* XXX */
 #define	READ_REG(rp)		(mips3_ld((volatile uint64_t *)(rp)))
 #define	WRITE_REG(rp, val)	(mips3_sd((volatile uint64_t *)(rp), (val)))
-static void	sb1250_cpu_intr(uint32_t, uint32_t, uint32_t, uint32_t);
+static void	sb1250_cpu_intr(uint32_t, uint32_t, vaddr_t, uint32_t);
 static void	*sb1250_intr_establish(u_int, u_int,
-		    void (*fun)(void *, uint32_t, uint32_t), void *);
+		    void (*fun)(void *, uint32_t, vaddr_t), void *);
 void
 sb1250_icu_init(void)
+{
 	int i;
 	char *name;
 	/* zero out the list of used interrupts/lines */
 	memset(ints_for_line, 0, sizeof ints_for_line);
 	imr_all = 0xffffffffffffffffULL;
 	memset(sb1250_ihands, 0, sizeof sb1250_ihands);
 	systemsw.s_cpu_intr = sb1250_cpu_intr;
 @@ -93,27 +93,27 @@ sb1250_icu_init(void)
 	WRITE_REG(SB1250_I_IMR_ADDR, imr_all);
 	for (i = 0; i < 64; i++) {
 		WRITE_REG(SB1250_I_MAP(i), SB1250_I_MAP_I0);
 		/* XXX add irq name arrays for various CPU models? */
 		name = malloc(8, M_DEVBUF, M_NOWAIT);
 		snprintf(name, 8, "irq %d", i);
 		evcnt_attach_dynamic(&sb1250_ihands[i].count, EVCNT_TYPE_INTR,
 		    NULL, "sb1250", name);	/* XXX "sb1250"? */
+	}
+}
 static void
-sb1250_cpu_intr(uint32_t status, uint32_t cause, uint32_t pc, uint32_t ipending)
+sb1250_cpu_intr(uint32_t status, uint32_t cause, vaddr_t pc, uint32_t ipending)
+{
 	int i, j;
 	uint64_t sstatus;
 	uint32_t cycles;
 	struct cpu_info *ci;
 	ci = curcpu();
 	ci->ci_idepth++;
 	uvmexp.intrs++;
 	/* XXX do something if 5? */
 	if (ipending & (MIPS_INT_MASK_0 << 5)) {
 		cycles = mips3_cp0_count_read();
 @@ -144,27 +144,27 @@ sb1250_cpu_intr(uint32_t status, uint32_
 	_splset(MIPS_SR_INT_IE | ((status & ~cause) & MIPS_HARD_INT_MASK));
 #ifdef __HAVE_FAST_SOFTINTS
 	ipending &= (MIPS_SOFT_INT_MASK_1|MIPS_SOFT_INT_MASK_0);
 	if (ipending == 0)
 		return;
 	_clrsoftintr(ipending);
 	softintr_dispatch(ipending);
 #endif
+}
 static void *
 sb1250_intr_establish(u_int num, u_int ipl,
-    void (*fun)(void *, uint32_t, uint32_t), void *arg)
+    void (*fun)(void *, uint32_t, vaddr_t), void *arg)
+{
 	int s, line;
 	s = splhigh();
 	if (num >= 64)					/* XXX */
 	    panic("invalid interrupt number (0x%x)", num);
 	if (ipl >= _NIPL)
 	    panic("invalid ipl (0x%x)", ipl);
 	if (sb1250_ihands[num].fun != NULL)
 	    panic("cannot share sb1250 interrupts");

 @@ -1,14 +1,14 @@
-/* $NetBSD: systemsw.c,v 1.14 2008/01/08 14:38:48 simonb Exp $ */
+/* $NetBSD: systemsw.c,v 1.14.28.1 2009/11/23 18:46:51 matt Exp $ */
 /*
  * Copyright 2000, 2001
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -23,43 +23,43 @@
  *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
  *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
  *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
  *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
  *    LIABLE FOR 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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: systemsw.c,v 1.14 2008/01/08 14:38:48 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: systemsw.c,v 1.14.28.1 2009/11/23 18:46:51 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 #include <mips/locore.h>
 #include <mips/mips3_clock.h>
 #include <machine/intr.h>
 #include <machine/systemsw.h>
 /* trivial functions for function switch */
 static void	clock_init_triv(void *);
-static void	cpu_intr_triv(uint32_t, uint32_t, uint32_t, uint32_t);
+static void	cpu_intr_triv(uint32_t, uint32_t, vaddr_t, uint32_t);
 /* system function switch */
 struct systemsw systemsw = {
 	cpu_intr_triv,
 	NULL,			/* clock intr arg */
 	clock_init_triv,
 	NULL,			/* statclock arg */
 	NULL,			/* s_statclock_init: dflt no-op */
 	NULL,			/* s_statclock_setrate: dflt no-op */
 	NULL,			/* intr_establish */
 @@ -67,27 +67,27 @@ struct systemsw systemsw = {
 int
 system_set_clockfns(void *arg, void (*init)(void *))
+{
 	if (systemsw.s_clock_init != clock_init_triv)
 		return 1;
 	systemsw.s_clock_arg = arg;
 	systemsw.s_clock_init = init;
 	return 0;
+}
 static void
-cpu_intr_triv(uint32_t status, uint32_t cause, uint32_t pc, uint32_t ipending)
+cpu_intr_triv(uint32_t status, uint32_t cause, vaddr_t pc, uint32_t ipending)
+{
 	panic("cpu_intr_triv");
+}
 void
 cpu_intr(uint32_t status, uint32_t cause, uint32_t pc, uint32_t ipending)
+{
 	(*systemsw.s_cpu_intr)(status, cause, pc, ipending);
+}
 static void