Module Name: src
Committed By: tsutsui
Date: Fri Mar 18 15:31:38 UTC 2011
Modified Files:
src/sys/arch/hpcmips/tx: tx39icu.c
src/sys/arch/hpcmips/vr: rtc.c vr.c vrip.c
Log Message:
Use vaddr_t for pc instead of uint32_t.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hpcmips/tx/tx39icu.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hpcmips/vr/rtc.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/hpcmips/vr/vr.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/hpcmips/vr/vrip.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/hpcmips/tx/tx39icu.c
diff -u src/sys/arch/hpcmips/tx/tx39icu.c:1.30 src/sys/arch/hpcmips/tx/tx39icu.c:1.31
--- src/sys/arch/hpcmips/tx/tx39icu.c:1.30 Sat Feb 26 12:54:41 2011
+++ src/sys/arch/hpcmips/tx/tx39icu.c Fri Mar 18 15:31:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39icu.c,v 1.30 2011/02/26 12:54:41 tsutsui Exp $ */
+/* $NetBSD: tx39icu.c,v 1.31 2011/03/18 15:31:38 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tx39icu.c,v 1.30 2011/02/26 12:54:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39icu.c,v 1.31 2011/03/18 15:31:38 tsutsui Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -206,7 +206,7 @@
void tx39_irqhigh_disestablish(tx_chipset_tag_t, int, int, int);
void tx39_irqhigh_establish(tx_chipset_tag_t, int, int, int,
int (*)(void *), void *);
-void tx39_irqhigh_intr(uint32_t, uint32_t, uint32_t);
+void tx39_irqhigh_intr(uint32_t, vaddr_t, uint32_t);
int tx39_irqhigh(int, int);
CFATTACH_DECL(tx39icu, sizeof(struct tx39icu_softc),
@@ -434,7 +434,7 @@
}
void
-tx39_irqhigh_intr(uint32_t ipending, uint32_t pc, uint32_t status)
+tx39_irqhigh_intr(uint32_t ipending, vaddr_t pc, uint32_t status)
{
struct txintr_high_entry *he;
struct tx39icu_softc *sc;
Index: src/sys/arch/hpcmips/vr/rtc.c
diff -u src/sys/arch/hpcmips/vr/rtc.c:1.31 src/sys/arch/hpcmips/vr/rtc.c:1.32
--- src/sys/arch/hpcmips/vr/rtc.c:1.31 Wed Mar 16 14:47:34 2011
+++ src/sys/arch/hpcmips/vr/rtc.c Fri Mar 18 15:31:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.31 2011/03/16 14:47:34 tsutsui Exp $ */
+/* $NetBSD: rtc.c,v 1.32 2011/03/18 15:31:38 tsutsui Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.31 2011/03/16 14:47:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.32 2011/03/18 15:31:38 tsutsui Exp $");
#include "opt_vr41xx.h"
@@ -100,7 +100,7 @@
int vrrtc_match(device_t, cfdata_t, void *);
void vrrtc_attach(device_t, device_t, void *);
-int vrrtc_intr(void*, uint32_t, uint32_t);
+int vrrtc_intr(void*, vaddr_t, uint32_t);
void vrrtc_dump_regs(struct vrrtc_softc *);
CFATTACH_DECL_NEW(vrrtc, sizeof(struct vrrtc_softc),
@@ -221,7 +221,7 @@
}
int
-vrrtc_intr(void *arg, uint32_t pc, uint32_t status)
+vrrtc_intr(void *arg, vaddr_t pc, uint32_t status)
{
struct vrrtc_softc *sc = arg;
struct clockframe cf;
Index: src/sys/arch/hpcmips/vr/vr.c
diff -u src/sys/arch/hpcmips/vr/vr.c:1.63 src/sys/arch/hpcmips/vr/vr.c:1.64
--- src/sys/arch/hpcmips/vr/vr.c:1.63 Wed Mar 16 13:38:34 2011
+++ src/sys/arch/hpcmips/vr/vr.c Fri Mar 18 15:31:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vr.c,v 1.63 2011/03/16 13:38:34 tsutsui Exp $ */
+/* $NetBSD: vr.c,v 1.64 2011/03/18 15:31:38 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.63 2011/03/16 13:38:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.64 2011/03/18 15:31:38 tsutsui Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -164,7 +164,7 @@
* CPU interrupt dispatch table (HwInt[0:3])
*/
STATIC int vr_null_handler(void *, uint32_t, uint32_t);
-STATIC int (*vr_intr_handler[4])(void *, uint32_t, uint32_t) =
+STATIC int (*vr_intr_handler[4])(void *, vaddr_t, uint32_t) =
{
vr_null_handler,
vr_null_handler,
@@ -558,7 +558,7 @@
}
void *
-vr_intr_establish(int line, int (*ih_fun)(void *, uint32_t, uint32_t),
+vr_intr_establish(int line, int (*ih_fun)(void *, vaddr_t, uint32_t),
void *ih_arg)
{
@@ -580,7 +580,7 @@
}
int
-vr_null_handler(void *arg, uint32_t pc, uint32_t status)
+vr_null_handler(void *arg, vaddr_t pc, uint32_t status)
{
printf("vr_null_handler\n");
Index: src/sys/arch/hpcmips/vr/vrip.c
diff -u src/sys/arch/hpcmips/vr/vrip.c:1.35 src/sys/arch/hpcmips/vr/vrip.c:1.36
--- src/sys/arch/hpcmips/vr/vrip.c:1.35 Wed Mar 16 13:24:42 2011
+++ src/sys/arch/hpcmips/vr/vrip.c Fri Mar 18 15:31:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vrip.c,v 1.35 2011/03/16 13:24:42 tsutsui Exp $ */
+/* $NetBSD: vrip.c,v 1.36 2011/03/18 15:31:38 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2002
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.35 2011/03/16 13:24:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.36 2011/03/18 15:31:38 tsutsui Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -81,7 +81,7 @@
int vrip_print(void *, const char *);
int vrip_search(struct device *, struct cfdata *,
const int *, void *);
-int vrip_intr(void *, u_int32_t, u_int32_t);
+int vrip_intr(void *, vaddr_t, u_int32_t);
int __vrip_power(vrip_chipset_tag_t, int, int);
vrip_intr_handle_t __vrip_intr_establish(vrip_chipset_tag_t, int, int,
@@ -491,7 +491,7 @@
}
int
-vrip_intr(void *arg, u_int32_t pc, u_int32_t status)
+vrip_intr(void *arg, vaddr_t pc, u_int32_t status)
{
struct vrip_softc *sc = (struct vrip_softc *)arg;
bus_space_tag_t iot = sc->sc_iot;
