diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2009-02-16 22:55:04 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-02-16 22:55:04 +0000 |
commit | c2b751a79c81d1b576d343c8569ebbe7b62e4632 (patch) | |
tree | 7ee11deb157526308e794ffef6ff9c26c98ec769 /sys/arch/aviion | |
parent | 5433c97066a2137250d8f26717bf78c79c02cb18 (diff) |
Since NMI are now handled separately, remove the ``interrupt type'' argument
from interrupt() and related function pointers.
Diffstat (limited to 'sys/arch/aviion')
-rw-r--r-- | sys/arch/aviion/aviion/av400_machdep.c | 4 | ||||
-rw-r--r-- | sys/arch/aviion/include/board.h | 8 |
2 files changed, 6 insertions, 6 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); \ |