Module Name: src
Committed By: matt
Date: Mon Nov 23 18:46:51 UTC 2009
Modified Files:
src/sys/arch/mips/sibyte/dev [matt-nb5-mips64]: sbmac.c sbscn.c
sbtimer.c
src/sys/arch/sbmips/include [matt-nb5-mips64]: systemsw.h
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: sb1250_icu.c systemsw.c
Log Message:
Use vaddr_t instead uint32_t for storing a pc since the latter won't work in
a LP64 kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.28.24.2 -r1.28.24.3 src/sys/arch/mips/sibyte/dev/sbmac.c
cvs rdiff -u -r1.27.14.1 -r1.27.14.2 src/sys/arch/mips/sibyte/dev/sbscn.c
cvs rdiff -u -r1.13.28.1 -r1.13.28.2 src/sys/arch/mips/sibyte/dev/sbtimer.c
cvs rdiff -u -r1.7 -r1.7.28.1 src/sys/arch/sbmips/include/systemsw.h
cvs rdiff -u -r1.9.36.1 -r1.9.36.2 src/sys/arch/sbmips/sbmips/sb1250_icu.c
cvs rdiff -u -r1.14 -r1.14.28.1 src/sys/arch/sbmips/sbmips/systemsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/sibyte/dev/sbmac.c
diff -u src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.2 src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.3
--- src/sys/arch/mips/sibyte/dev/sbmac.c:1.28.24.2 Mon Nov 23 18:28:46 2009
+++ src/sys/arch/mips/sibyte/dev/sbmac.c Mon Nov 23 18:46:50 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -33,7 +33,7 @@
*/
#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"
@@ -252,7 +252,7 @@
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);
@@ -1731,7 +1731,7 @@
/* 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;
Index: src/sys/arch/mips/sibyte/dev/sbscn.c
diff -u src/sys/arch/mips/sibyte/dev/sbscn.c:1.27.14.1 src/sys/arch/mips/sibyte/dev/sbscn.c:1.27.14.2
--- src/sys/arch/mips/sibyte/dev/sbscn.c:1.27.14.1 Mon Nov 23 18:28:47 2009
+++ src/sys/arch/mips/sibyte/dev/sbscn.c Mon Nov 23 18:46:50 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -109,7 +109,7 @@
*/
#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
@@ -170,7 +170,7 @@
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);
@@ -1471,7 +1471,7 @@
}
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;
Index: src/sys/arch/mips/sibyte/dev/sbtimer.c
diff -u src/sys/arch/mips/sibyte/dev/sbtimer.c:1.13.28.1 src/sys/arch/mips/sibyte/dev/sbtimer.c:1.13.28.2
--- src/sys/arch/mips/sibyte/dev/sbtimer.c:1.13.28.1 Mon Nov 23 18:28:47 2009
+++ src/sys/arch/mips/sibyte/dev/sbtimer.c Mon Nov 23 18:46:50 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -33,7 +33,7 @@
*/
#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>
@@ -64,10 +64,9 @@
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_statclockintr(void *arg, uint32_t status,
- uint32_t pc);
-static void sbtimer_miscintr(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, vaddr_t pc);
+static void sbtimer_miscintr(void *arg, uint32_t status, vaddr_t pc);
static void sbtimer_clock_init(void *arg);
@@ -87,7 +86,7 @@
{
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 = "";
@@ -164,7 +163,7 @@
}
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;
@@ -186,7 +185,7 @@
}
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;
@@ -202,7 +201,7 @@
}
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;
Index: src/sys/arch/sbmips/include/systemsw.h
diff -u src/sys/arch/sbmips/include/systemsw.h:1.7 src/sys/arch/sbmips/include/systemsw.h:1.7.28.1
--- src/sys/arch/sbmips/include/systemsw.h:1.7 Tue Jan 8 14:38:48 2008
+++ src/sys/arch/sbmips/include/systemsw.h Mon Nov 23 18:46:50 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -39,7 +39,7 @@
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 *);
@@ -49,7 +49,7 @@
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;
Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.1 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.2
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.1 Mon Nov 23 18:28:47 2009
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c Mon Nov 23 18:46:50 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -33,7 +33,7 @@
*/
#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>
@@ -53,7 +53,7 @@
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;
@@ -72,9 +72,9 @@
#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)
@@ -103,7 +103,7 @@
}
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;
@@ -154,7 +154,7 @@
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;
Index: src/sys/arch/sbmips/sbmips/systemsw.c
diff -u src/sys/arch/sbmips/sbmips/systemsw.c:1.14 src/sys/arch/sbmips/sbmips/systemsw.c:1.14.28.1
--- src/sys/arch/sbmips/sbmips/systemsw.c:1.14 Tue Jan 8 14:38:48 2008
+++ src/sys/arch/sbmips/sbmips/systemsw.c Mon Nov 23 18:46:51 2009
@@ -1,4 +1,4 @@
-/* $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
@@ -33,7 +33,7 @@
*/
#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>
@@ -49,7 +49,7 @@
/* 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 = {
@@ -77,7 +77,7 @@
}
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");
