From dc551940fc5c2200f46181dfc4cee2eb5ac68366 Mon Sep 17 00:00:00 2001 From: Jake Burkholder Date: Sat, 29 Dec 2001 06:57:55 +0000 Subject: [PATCH] Make it clear that IH_SHIFT is expected to be that of a pointer. Make intr_handlers an array of function pointers instead of small structures. --- sys/sparc64/include/intr_machdep.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/sparc64/include/intr_machdep.h b/sys/sparc64/include/intr_machdep.h index 01546e456f1..c4991deabb3 100644 --- a/sys/sparc64/include/intr_machdep.h +++ b/sys/sparc64/include/intr_machdep.h @@ -35,7 +35,7 @@ #define IQ_SIZE (NPIL * 2) #define IQ_MASK (IQ_SIZE - 1) -#define IH_SHIFT 3 +#define IH_SHIFT PTR_SHIFT #define IQE_SHIFT 5 #define IV_SHIFT 5 @@ -47,10 +47,6 @@ typedef void ih_func_t(struct trapframe *); typedef void iv_func_t(void *); -struct intr_handler { - ih_func_t *ih_func; -}; - struct iqe { u_int iqe_tag; u_int iqe_pri; @@ -75,8 +71,7 @@ struct intr_vector { u_int iv_vec; }; -extern struct intr_handler intr_handlers[]; -extern struct intr_queue intr_queues[]; +extern ih_func_t *intr_handlers[]; extern struct intr_vector intr_vectors[]; void intr_setup(int level, ih_func_t *ihf, int pri, iv_func_t *ivf,