Module Name: src
Committed By: tsutsui
Date: Wed Mar 16 13:24:43 UTC 2011
Modified Files:
src/sys/arch/hpcmips/vr: vrip.c
Log Message:
Avoid possible future device_t/softc confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 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/vr/vrip.c
diff -u src/sys/arch/hpcmips/vr/vrip.c:1.34 src/sys/arch/hpcmips/vr/vrip.c:1.35
--- src/sys/arch/hpcmips/vr/vrip.c:1.34 Wed Mar 18 10:22:29 2009
+++ src/sys/arch/hpcmips/vr/vrip.c Wed Mar 16 13:24:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vrip.c,v 1.34 2009/03/18 10:22:29 cegger Exp $ */
+/* $NetBSD: vrip.c,v 1.35 2011/03/16 13:24:42 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2002
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.34 2009/03/18 10:22:29 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.35 2011/03/16 13:24:42 tsutsui Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -238,7 +238,7 @@
/*
* Level 1 interrupts are redirected to HwInt0
*/
- vr_intr_establish(VR_INTR0, vrip_intr, self);
+ vr_intr_establish(VR_INTR0, vrip_intr, sc);
the_vrip_sc = sc;
/*
* Attach each devices
@@ -491,9 +491,9 @@
}
int
-vrip_intr(void *arg, u_int32_t pc, u_int32_t statusReg)
+vrip_intr(void *arg, u_int32_t pc, u_int32_t status)
{
- struct vrip_softc *sc = (struct vrip_softc*)arg;
+ struct vrip_softc *sc = (struct vrip_softc *)arg;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
int i;
