Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use vaddr_t for pc instead of uint32_t.

This commit is contained in:
tsutsui 2011-03-18 15:31:38 +00:00
parent f6eafc1d10
commit 8411622879
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/hpcmips/tx/tx39icu.c
View File

@ -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_intr_decode(int, int *, int *);
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 @@ tx39_irqhigh(int set, int bit)
}
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;

8
sys/arch/hpcmips/vr/rtc.c
View File

@ -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 @@ struct platform_clock vr_clock = {
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 @@ vrrtc_attach(device_t parent, device_t self, void *aux)
}
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;

10
sys/arch/hpcmips/vr/vr.c
View File

@ -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 @@ STATIC void vr_reboot(int, char *);
* 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 @@ VR_INTR(int ppl, vaddr_t pc, uint32_t status)
}
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 @@ vr_intr_disestablish(void *ih)
}
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");

8
sys/arch/hpcmips/vr/vrip.c
View File

@ -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 @@ void vripattach(struct device *, struct device *, void *);
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 @@ __vrip_intr_setmask2(vrip_chipset_tag_t vc, vrip_intr_handle_t handle,
}
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;