diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-07-30 19:02:09 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-07-30 19:02:09 +0000 |
| commit | b0893d436e5f0487e0bae828af4b9a388280d47a (patch) | |
| tree | 054d4d7203632e0e5d8f303713cfccb1efe413d5 /sys/arch/mvme88k/include/cpu.h | |
| parent | bc85dce4e6d789a03a4f3802a9c06f89f03a793b (diff) | |
Move evcount structures inside struct intrhand, this makes more sense and
gives us more counters in the process.
Also clean up intrhand structures and usage, especially move them to SLISTs.
Diffstat (limited to 'sys/arch/mvme88k/include/cpu.h')
| -rw-r--r-- | sys/arch/mvme88k/include/cpu.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h index fa413df93ea..f01aa0cdf40 100644 --- a/sys/arch/mvme88k/include/cpu.h +++ b/sys/arch/mvme88k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.28 2004/07/24 15:05:07 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.29 2004/07/30 19:02:08 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1992, 1993 @@ -40,17 +40,19 @@ #ifndef _MVME88K_CPU_H_ #define _MVME88K_CPU_H_ +#include <sys/evcount.h> #include <m88k/cpu.h> struct intrhand { + SLIST_ENTRY(intrhand) ih_link; int (*ih_fn)(void *); void *ih_arg; int ih_ipl; int ih_wantframe; - struct intrhand *ih_next; + struct evcount ih_count; }; -int intr_establish(int vec, struct intrhand *); +int intr_establish(int, struct intrhand *, const char *); /* * There are 256 possible vectors on a mvme88k platform (including @@ -58,6 +60,8 @@ int intr_establish(int vec, struct intrhand *); * handler for the given vector. vector number is used to index * into the intr_handlers[] table. */ -extern struct intrhand *intr_handlers[256]; +#define NVMEINTR 256 +typedef SLIST_HEAD(, intrhand) intrhand_t; +extern intrhand_t intr_handlers[NVMEINTR]; #endif |