summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/aviion/aviion/av400_machdep.c4
-rw-r--r--sys/arch/aviion/include/board.h8
-rw-r--r--sys/arch/luna88k/include/cpu.h4
-rw-r--r--sys/arch/luna88k/luna88k/machdep.c4
-rw-r--r--sys/arch/m88k/include/trap.h10
-rw-r--r--sys/arch/m88k/m88k/eh_common.S8
-rw-r--r--sys/arch/m88k/m88k/trap.c6
-rw-r--r--sys/arch/mvme88k/include/cpu.h4
-rw-r--r--sys/arch/mvme88k/mvme88k/m187_machdep.c6
-rw-r--r--sys/arch/mvme88k/mvme88k/m188_machdep.c6
-rw-r--r--sys/arch/mvme88k/mvme88k/m197_machdep.c6
-rw-r--r--sys/arch/mvme88k/mvme88k/machdep.c4
12 files changed, 31 insertions, 39 deletions
diff --git a/sys/arch/aviion/aviion/av400_machdep.c b/sys/arch/aviion/aviion/av400_machdep.c
index dece026be49..3948ae39039 100644
--- a/sys/arch/aviion/aviion/av400_machdep.c
+++ b/sys/arch/aviion/aviion/av400_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: av400_machdep.c,v 1.13 2007/12/27 23:19:12 miod Exp $ */
+/* $OpenBSD: av400_machdep.c,v 1.14 2009/02/16 22:54:59 miod Exp $ */
/*
* Copyright (c) 2006, 2007, Miodrag Vallat.
*
@@ -423,7 +423,7 @@ const u_int obio_vec[32] = {
#define VME_BERR_MASK 0x100 /* timeout during VME IACK cycle */
void
-av400_intr(u_int v, struct trapframe *eframe)
+av400_intr(struct trapframe *eframe)
{
int cpu = cpu_number();
u_int32_t cur_mask, ign_mask;
diff --git a/sys/arch/aviion/include/board.h b/sys/arch/aviion/include/board.h
index 2a7c0993851..21258eadb04 100644
--- a/sys/arch/aviion/include/board.h
+++ b/sys/arch/aviion/include/board.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: board.h,v 1.3 2007/12/19 22:05:06 miod Exp $ */
+/* $OpenBSD: board.h,v 1.4 2009/02/16 22:55:03 miod Exp $ */
/*
* Copyright (c) 2006, 2007, Miodrag Vallat
*
@@ -37,7 +37,7 @@ struct board {
vaddr_t (*memsize)(void);
void (*startup)(void);
- void (*intr)(u_int, struct trapframe *);
+ void (*intr)(struct trapframe *);
void (*init_clocks)(void);
u_int (*getipl)(void);
u_int (*setipl)(u_int);
@@ -48,14 +48,14 @@ struct board {
pmap_table_t ptable;
};
-#define md_interrupt_func(t, f) platform->intr(t, f)
+#define md_interrupt_func(f) platform->intr(f)
#define DECLARE_BOARD(b) \
extern const struct board board_av##b; \
void av##b##_bootstrap(void); \
vaddr_t av##b##_memsize(void); \
void av##b##_startup(void); \
-void av##b##_intr(u_int, struct trapframe *); \
+void av##b##_intr(struct trapframe *); \
void av##b##_init_clocks(void); \
u_int av##b##_getipl(void); \
u_int av##b##_setipl(u_int); \
diff --git a/sys/arch/luna88k/include/cpu.h b/sys/arch/luna88k/include/cpu.h
index 7221d9e103b..e2990974dfe 100644
--- a/sys/arch/luna88k/include/cpu.h
+++ b/sys/arch/luna88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.4 2004/11/08 16:39:28 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.5 2009/02/16 22:55:03 miod Exp $ */
/* public domain */
#ifndef _LUNA88K_CPU_H_
#define _LUNA88k_CPU_H_
@@ -6,7 +6,7 @@
#include <m88k/cpu.h>
#ifdef _KERNEL
-void luna88k_ext_int(u_int v, struct trapframe *eframe);
+void luna88k_ext_int(struct trapframe *eframe);
#define md_interrupt_func luna88k_ext_int
#endif /* _KERNEL */
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index b2b145f0fab..3230fa4d618 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.60 2009/02/04 17:19:17 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.61 2009/02/16 22:55:03 miod Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -841,7 +841,7 @@ secondary_main()
*/
void
-luna88k_ext_int(u_int v, struct trapframe *eframe)
+luna88k_ext_int(struct trapframe *eframe)
{
int cpu = cpu_number();
u_int32_t cur_mask, cur_int;
diff --git a/sys/arch/m88k/include/trap.h b/sys/arch/m88k/include/trap.h
index 578ef6de081..6c65ba34f4a 100644
--- a/sys/arch/m88k/include/trap.h
+++ b/sys/arch/m88k/include/trap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.h,v 1.7 2009/02/13 23:33:49 miod Exp $ */
+/* $OpenBSD: trap.h,v 1.8 2009/02/16 22:55:03 miod Exp $ */
/*
* Mach Operating System
* Copyright (c) 1992 Carnegie Mellon University
@@ -55,18 +55,12 @@
#define T_USER 19 /* user mode fault */
-/*
- * Interrupt type values
- */
-#define T_INT 0 /* regular interrupts */
-#define T_NON_MASK 1 /* non-maskable interrupts */
-
#ifndef _LOCORE
void cache_flush(struct trapframe *);
void ast(struct trapframe *);
void nmi(struct trapframe *);
-void interrupt(u_int, struct trapframe *);
+void interrupt(struct trapframe *);
void m88100_syscall(register_t, struct trapframe *);
void m88100_trap(u_int, struct trapframe *);
diff --git a/sys/arch/m88k/m88k/eh_common.S b/sys/arch/m88k/m88k/eh_common.S
index 4c0ed1e466a..669f0a02b12 100644
--- a/sys/arch/m88k/m88k/eh_common.S
+++ b/sys/arch/m88k/m88k/eh_common.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: eh_common.S,v 1.50 2009/02/16 20:18:48 miod Exp $ */
+/* $OpenBSD: eh_common.S,v 1.51 2009/02/16 22:55:03 miod Exp $ */
/*
* Mach Operating System
* Copyright (c) 1993-1991 Carnegie Mellon University
@@ -378,8 +378,7 @@ GLOBAL(unknown_handler)
/* interrupt exception handler */
GLOBAL(interrupt_handler)
PREP88100("interrupt", 1,,)
- or r2, r0, T_INT
- or r3, r0, r30
+ or r2, r0, r30
XCALL(_C_LABEL(interrupt), _ASM_LABEL(check_ast))
/* instruction access exception handler */
@@ -1536,8 +1535,7 @@ GLOBAL(m88110_unknown_handler)
/* interrupt exception handler */
GLOBAL(m88110_interrupt_handler)
PREP88110("interrupt", 1,)
- or r2, r0, T_INT
- or r3, r0, r30
+ or r2, r0, r30
XCALL(_C_LABEL(interrupt), _ASM_LABEL(check_ast))
/* instruction access exception handler */
diff --git a/sys/arch/m88k/m88k/trap.c b/sys/arch/m88k/m88k/trap.c
index ca1b5ed8cd5..cbaacef4d26 100644
--- a/sys/arch/m88k/m88k/trap.c
+++ b/sys/arch/m88k/m88k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.67 2009/02/13 23:33:51 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.68 2009/02/16 22:55:03 miod Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
* Copyright (c) 1998 Steve Murphree, Jr.
@@ -178,12 +178,12 @@ panictrap(int type, struct trapframe *frame)
* Handle external interrupts.
*/
void
-interrupt(u_int type, struct trapframe *frame)
+interrupt(struct trapframe *frame)
{
struct cpu_info *ci = curcpu();
ci->ci_intrdepth++;
- md_interrupt_func(type, frame);
+ md_interrupt_func(frame);
ci->ci_intrdepth--;
}
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h
index ea9cdff7d44..929fb8f6a35 100644
--- a/sys/arch/mvme88k/include/cpu.h
+++ b/sys/arch/mvme88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.39 2009/02/13 23:33:51 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.40 2009/02/16 22:55:03 miod Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
#ifdef _KERNEL
/* board dependent pointers */
-extern void (*md_interrupt_func_ptr)(u_int, struct trapframe *);
+extern void (*md_interrupt_func_ptr)(struct trapframe *);
#define md_interrupt_func (*md_interrupt_func_ptr)
extern void (*md_nmi_func_ptr)(struct trapframe *);
#define md_nmi_func (*md_nmi_func_ptr)
diff --git a/sys/arch/mvme88k/mvme88k/m187_machdep.c b/sys/arch/mvme88k/mvme88k/m187_machdep.c
index 4773648007b..8e5e953b00d 100644
--- a/sys/arch/mvme88k/mvme88k/m187_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m187_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m187_machdep.c,v 1.18 2009/02/13 23:26:51 miod Exp $ */
+/* $OpenBSD: m187_machdep.c,v 1.19 2009/02/16 22:55:03 miod Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -64,7 +64,7 @@
#include <mvme88k/mvme88k/clockvar.h>
void m187_bootstrap(void);
-void m187_ext_int(u_int, struct trapframe *);
+void m187_ext_int(struct trapframe *);
u_int m187_getipl(void);
vaddr_t m187_memsize(void);
u_int m187_raiseipl(u_int);
@@ -112,7 +112,7 @@ m187_startup()
*/
void
-m187_ext_int(u_int v, struct trapframe *eframe)
+m187_ext_int(struct trapframe *eframe)
{
int level;
struct intrhand *intr;
diff --git a/sys/arch/mvme88k/mvme88k/m188_machdep.c b/sys/arch/mvme88k/mvme88k/m188_machdep.c
index 297721eae3e..a5294ffd3b1 100644
--- a/sys/arch/mvme88k/mvme88k/m188_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m188_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m188_machdep.c,v 1.46 2009/02/13 23:26:51 miod Exp $ */
+/* $OpenBSD: m188_machdep.c,v 1.47 2009/02/16 22:55:03 miod Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -138,7 +138,7 @@ u_int safe_level(u_int, u_int);
void m188_bootstrap(void);
void m188_clock_ipi_handler(struct trapframe *);
-void m188_ext_int(u_int, struct trapframe *);
+void m188_ext_int(struct trapframe *);
u_int m188_getipl(void);
void m188_init_clocks(void);
void m188_ipi_handler(struct trapframe *);
@@ -477,7 +477,7 @@ const u_int obio_vec[32] = {
#define VME_BERR_MASK 0x100 /* timeout during VME IACK cycle */
void
-m188_ext_int(u_int v, struct trapframe *eframe)
+m188_ext_int(struct trapframe *eframe)
{
#ifdef MULTIPROCESSOR
struct cpu_info *ci = curcpu();
diff --git a/sys/arch/mvme88k/mvme88k/m197_machdep.c b/sys/arch/mvme88k/mvme88k/m197_machdep.c
index 32d2ecc048f..e7bd5c123c8 100644
--- a/sys/arch/mvme88k/mvme88k/m197_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m197_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m197_machdep.c,v 1.31 2009/02/13 23:33:51 miod Exp $ */
+/* $OpenBSD: m197_machdep.c,v 1.32 2009/02/16 22:55:03 miod Exp $ */
/*
* Copyright (c) 2009 Miodrag Vallat.
@@ -86,7 +86,7 @@
void m197_bootstrap(void);
void m197_clock_ipi_handler(struct trapframe *);
void m197_delay(int);
-void m197_ext_int(u_int, struct trapframe *);
+void m197_ext_int(struct trapframe *);
u_int m197_getipl(void);
void m197_ipi_handler(struct trapframe *);
vaddr_t m197_memsize(void);
@@ -185,7 +185,7 @@ m197_startup()
*/
void
-m197_ext_int(u_int v, struct trapframe *eframe)
+m197_ext_int(struct trapframe *eframe)
{
#ifdef MULTIPROCESSOR
struct cpu_info *ci = curcpu();
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 110779fc2ee..8629dd09631 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.220 2009/02/13 23:33:51 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.221 2009/02/16 22:55:03 miod Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -123,7 +123,7 @@ extern void m197_startup(void);
intrhand_t intr_handlers[NVMEINTR];
/* board dependent pointers */
-void (*md_interrupt_func_ptr)(u_int, struct trapframe *);
+void (*md_interrupt_func_ptr)(struct trapframe *);
#ifdef M88110
void (*md_nmi_func_ptr)(struct trapframe *);
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 12:36:30 +0000