Changed the type of an isa/general interrupt handler to take a

`void *' arg.  Fixed or hid most of the resulting type mismatches.
Handlers can now be updated locally (except for reworking their
global declarations in isa_device.h).

3 files changed, 10 insertions, 10 deletions

diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c
index 7e5363f..6382d19 100644
--- a/sys/amd64/isa/intr_machdep.c
+++ b/sys/amd64/isa/intr_machdep.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr_machdep.c,v 1.10 1998/05/17 21:15:18 tegge Exp $
+ *	$Id: intr_machdep.c,v 1.11 1998/05/31 10:53:52 bde Exp $
  */
 
 #include "opt_auto_eoi.h"
@@ -87,7 +87,7 @@ u_long	*intr_countp[ICU_LEN];
 inthand2_t *intr_handler[ICU_LEN];
 u_int	intr_mask[ICU_LEN];
 static u_int*	intr_mptr[ICU_LEN];
-int	intr_unit[ICU_LEN];
+void	*intr_unit[ICU_LEN];
 
 static inthand_t *fastintr[ICU_LEN] = {
 	&IDTVEC(fastintr0), &IDTVEC(fastintr1),
@@ -117,7 +117,7 @@ static inthand_t *slowintr[ICU_LEN] = {
 #endif /* APIC_IO */
 };
 
-static inthand2_t isa_strayintr;
+static ointhand2_t isa_strayintr;
 
 #ifdef PC98
 #define NMI_PARITY 0x04
@@ -404,7 +404,7 @@ icu_setup(int intr, inthand2_t *handler, void *arg, u_int *maskptr, int flags)
 	intr_handler[intr] = handler;
 	intr_mptr[intr] = maskptr;
 	intr_mask[intr] = mask | (1 << intr);
-	intr_unit[intr] = (int) arg;
+	intr_unit[intr] = arg;
 #ifdef FAST_HI
 	if (flags & INTR_FAST) {
 		vector = TPR_FAST_INTS + intr;
diff --git a/sys/amd64/isa/intr_machdep.h b/sys/amd64/isa/intr_machdep.h
index dc8f900..7cdce87 100644
--- a/sys/amd64/isa/intr_machdep.h
+++ b/sys/amd64/isa/intr_machdep.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: intr_machdep.h,v 1.11 1998/03/03 22:56:30 tegge Exp $
+ *	$Id: intr_machdep.h,v 1.12 1998/05/31 10:53:54 bde Exp $
  */
 
 #ifndef _I386_ISA_INTR_MACHDEP_H_
@@ -144,7 +144,7 @@ extern char intrnames[];	/* string table containing device names */
 extern u_long *intr_countp[];	/* pointers into intrcnt[] */
 extern inthand2_t *intr_handler[];	/* C entry points of intr handlers */
 extern u_int intr_mask[];	/* sets of intrs masked during handling of 1 */
-extern int intr_unit[];		/* cookies to pass to intr handlers */
+extern void *intr_unit[];	/* cookies to pass to intr handlers */
 
 inthand_t
 	IDTVEC(fastintr0), IDTVEC(fastintr1),
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c
index 7e5363f..6382d19 100644
--- a/sys/amd64/isa/nmi.c
+++ b/sys/amd64/isa/nmi.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr_machdep.c,v 1.10 1998/05/17 21:15:18 tegge Exp $
+ *	$Id: intr_machdep.c,v 1.11 1998/05/31 10:53:52 bde Exp $
  */
 
 #include "opt_auto_eoi.h"
@@ -87,7 +87,7 @@ u_long	*intr_countp[ICU_LEN];
 inthand2_t *intr_handler[ICU_LEN];
 u_int	intr_mask[ICU_LEN];
 static u_int*	intr_mptr[ICU_LEN];
-int	intr_unit[ICU_LEN];
+void	*intr_unit[ICU_LEN];
 
 static inthand_t *fastintr[ICU_LEN] = {
 	&IDTVEC(fastintr0), &IDTVEC(fastintr1),
@@ -117,7 +117,7 @@ static inthand_t *slowintr[ICU_LEN] = {
 #endif /* APIC_IO */
 };
 
-static inthand2_t isa_strayintr;
+static ointhand2_t isa_strayintr;
 
 #ifdef PC98
 #define NMI_PARITY 0x04
@@ -404,7 +404,7 @@ icu_setup(int intr, inthand2_t *handler, void *arg, u_int *maskptr, int flags)
 	intr_handler[intr] = handler;
 	intr_mptr[intr] = maskptr;
 	intr_mask[intr] = mask | (1 << intr);
-	intr_unit[intr] = (int) arg;
+	intr_unit[intr] = arg;
 #ifdef FAST_HI
 	if (flags & INTR_FAST) {
 		vector = TPR_FAST_INTS + intr;