Module Name: src
Committed By: mrg
Date: Tue Dec 15 06:01:43 UTC 2009
Modified Files:
src/sys/arch/evbmips/evbmips: interrupt.c
src/sys/arch/hpcmips/hpcmips: interrupt.c
src/sys/arch/hpcmips/include: sysconf.h
src/sys/arch/mipsco/mipsco: interrupt.c
src/sys/arch/sgimips/sgimips: cpu.c
Log Message:
convert all mips cpu_intr() to have the standard
(uint32_t, uint32_t, vaddr_t, uint32_t) signature.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/evbmips/interrupt.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcmips/hpcmips/interrupt.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpcmips/include/sysconf.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mipsco/mipsco/interrupt.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sgimips/sgimips/cpu.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/evbmips/evbmips/interrupt.c
diff -u src/sys/arch/evbmips/evbmips/interrupt.c:1.12 src/sys/arch/evbmips/evbmips/interrupt.c:1.13
--- src/sys/arch/evbmips/evbmips/interrupt.c:1.12 Mon Dec 14 00:46:02 2009
+++ src/sys/arch/evbmips/evbmips/interrupt.c Tue Dec 15 06:01:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.12 2009/12/14 00:46:02 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.13 2009/12/15 06:01:43 mrg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.12 2009/12/14 00:46:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.13 2009/12/15 06:01:43 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -50,7 +50,7 @@
}
void
-cpu_intr(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
+cpu_intr(uint32_t status, uint32_t cause, vaddr_t pc, uint32_t ipending)
{
struct clockframe cf;
struct cpu_info *ci;
Index: src/sys/arch/hpcmips/hpcmips/interrupt.c
diff -u src/sys/arch/hpcmips/hpcmips/interrupt.c:1.15 src/sys/arch/hpcmips/hpcmips/interrupt.c:1.16
--- src/sys/arch/hpcmips/hpcmips/interrupt.c:1.15 Mon Dec 14 00:46:04 2009
+++ src/sys/arch/hpcmips/hpcmips/interrupt.c Tue Dec 15 06:01:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.15 2009/12/14 00:46:04 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.16 2009/12/15 06:01:43 mrg Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.15 2009/12/14 00:46:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.16 2009/12/15 06:01:43 mrg Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -64,7 +64,7 @@
*
*/
void
-cpu_intr(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
+cpu_intr(uint32_t status, uint32_t cause, vaddr_t pc, uint32_t ipending)
{
(*platform.cpu_intr)(status, cause, pc, ipending);
Index: src/sys/arch/hpcmips/include/sysconf.h
diff -u src/sys/arch/hpcmips/include/sysconf.h:1.14 src/sys/arch/hpcmips/include/sysconf.h:1.15
--- src/sys/arch/hpcmips/include/sysconf.h:1.14 Mon Dec 14 00:46:04 2009
+++ src/sys/arch/hpcmips/include/sysconf.h Tue Dec 15 06:01:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sysconf.h,v 1.14 2009/12/14 00:46:04 matt Exp $ */
+/* $NetBSD: sysconf.h,v 1.15 2009/12/15 06:01:43 mrg Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -62,7 +62,7 @@
* reboot - reboot or powerdown
* clock -
*/
- void (*cpu_intr)(u_int32_t, u_int32_t, vaddr_t, u_int32_t);
+ void (*cpu_intr)(uint32_t, uint32_t, vaddr_t, uint32_t);
void (*cpu_idle)(void);
void (*cons_init)(void);
void (*fb_init)(void **);
Index: src/sys/arch/mipsco/mipsco/interrupt.c
diff -u src/sys/arch/mipsco/mipsco/interrupt.c:1.8 src/sys/arch/mipsco/mipsco/interrupt.c:1.9
--- src/sys/arch/mipsco/mipsco/interrupt.c:1.8 Mon Dec 14 00:46:09 2009
+++ src/sys/arch/mipsco/mipsco/interrupt.c Tue Dec 15 06:01:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.8 2009/12/14 00:46:09 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.9 2009/12/15 06:01:43 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.8 2009/12/14 00:46:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.9 2009/12/15 06:01:43 mrg Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -42,7 +42,7 @@
#include <machine/sysconf.h>
void
-cpu_intr(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
+cpu_intr(uint32_t status, uint32_t cause, vaddr_t pc, uint32_t ipending)
{
struct cpu_info *ci;
Index: src/sys/arch/sgimips/sgimips/cpu.c
diff -u src/sys/arch/sgimips/sgimips/cpu.c:1.22 src/sys/arch/sgimips/sgimips/cpu.c:1.23
--- src/sys/arch/sgimips/sgimips/cpu.c:1.22 Mon Dec 14 00:46:13 2009
+++ src/sys/arch/sgimips/sgimips/cpu.c Tue Dec 15 06:01:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.22 2009/12/14 00:46:13 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.23 2009/12/15 06:01:43 mrg Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.22 2009/12/14 00:46:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.23 2009/12/15 06:01:43 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -55,7 +55,7 @@
static int cpu_match(struct device *, struct cfdata *, void *);
static void cpu_attach(struct device *, struct device *, void *);
-void cpu_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+void cpu_intr(uint32_t, uint32_t, vaddr_t, uint32_t);
void *cpu_intr_establish(int, int, int (*func)(void *), void *);
void mips1_fpu_intr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
@@ -103,7 +103,7 @@
* sorts of Bad Things(tm) to happen, including kernel stack overflows.
*/
void
-cpu_intr(u_int32_t status, u_int32_t cause, vaddr_t pc, u_int32_t ipending)
+cpu_intr(uint32_t status, uint32_t cause, vaddr_t pc, uint32_t ipending)
{
struct cpu_info *ci;
