Move interrupt handling code from isa.c to a new file. This should make

isa.c (slightly) more portable and will make my life developing the really
portable version much easier.

Reviewed by:	peter, fsmp

1 files changed, 1 insertions, 54 deletions

diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index dad1f4d..bf7c7a9 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.40 1997/05/26 14:42:24 se Exp $
+ *	$Id: isa_device.h,v 1.41 1997/05/31 09:07:36 peter Exp $
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
@@ -41,13 +41,6 @@
  * ISA Bus Autoconfiguration
  */
 
-#define	IDTVEC(name)	__CONCAT(X,name)
-
-/*
- * Type of the first (asm) part of an interrupt handler.
- */
-typedef void inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss));
-
 /*
  * Per device structure.
  *
@@ -106,14 +99,6 @@ struct isa_driver {
 
 #ifdef KERNEL
 
-extern char eintrnames[];	/* end of intrnames[] */
-extern u_long intrcnt[];	/* counts for for each device and stray */
-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 struct isa_device isa_biotab_fdc[];
 extern struct isa_device isa_biotab_wdc[];
 extern struct isa_device isa_devtab_bio[];
@@ -121,34 +106,6 @@ extern struct isa_device isa_devtab_net[];
 extern struct isa_device isa_devtab_null[];
 extern struct isa_device isa_devtab_tty[];
 
-inthand_t
-	IDTVEC(fastintr0), IDTVEC(fastintr1),
-	IDTVEC(fastintr2), IDTVEC(fastintr3),
-	IDTVEC(fastintr4), IDTVEC(fastintr5),
-	IDTVEC(fastintr6), IDTVEC(fastintr7),
-	IDTVEC(fastintr8), IDTVEC(fastintr9),
-	IDTVEC(fastintr10), IDTVEC(fastintr11),
-	IDTVEC(fastintr12), IDTVEC(fastintr13),
-	IDTVEC(fastintr14), IDTVEC(fastintr15);
-inthand_t
-	IDTVEC(intr0), IDTVEC(intr1), IDTVEC(intr2), IDTVEC(intr3),
-	IDTVEC(intr4), IDTVEC(intr5), IDTVEC(intr6), IDTVEC(intr7),
-	IDTVEC(intr8), IDTVEC(intr9), IDTVEC(intr10), IDTVEC(intr11),
-	IDTVEC(intr12), IDTVEC(intr13), IDTVEC(intr14), IDTVEC(intr15);
-
-/* these functions ONLY exist in an SMP/APIC_IO kernel: */
-inthand_t
-	IDTVEC(fastintr16), IDTVEC(fastintr17),
-	IDTVEC(fastintr18), IDTVEC(fastintr19),
-	IDTVEC(fastintr20), IDTVEC(fastintr21),
-	IDTVEC(fastintr22), IDTVEC(fastintr23);
-inthand_t
-	IDTVEC(intr16), IDTVEC(intr17), IDTVEC(intr18), IDTVEC(intr19),
-	IDTVEC(intr20), IDTVEC(intr21), IDTVEC(intr22), IDTVEC(intr23);
-#define XINVLTLB_OFFSET	32
-inthand_t
-	Xinvltlb;
-
 struct isa_device *
 	find_display __P((void));
 struct isa_device *
@@ -156,23 +113,13 @@ struct isa_device *
 			 int unit));
 int	haveseen_isadev __P((struct isa_device *dvp, u_int checkbits));
 void	isa_configure __P((void));
-void	isa_defaultirq __P((void));
 void	isa_dmacascade __P((int chan));
 void	isa_dmadone __P((int flags, caddr_t addr, int nbytes, int chan));
 void	isa_dmainit __P((int chan, u_int bouncebufsize));
 void	isa_dmastart __P((int flags, caddr_t addr, u_int nbytes, int chan));
 int	isa_dma_acquire __P((int chan));
 void	isa_dma_release __P((int chan));
-int	isa_irq_pending __P((struct isa_device *dvp));
-/* this function ONLY exists in an SMP/APIC_IO kernel: */
-int	icu_irq_pending __P((struct isa_device *dvp));
-int	isa_nmi __P((int cd));
 void	reconfig_isadev __P((struct isa_device *isdp, u_int *mp));
-void	update_intrname __P((int intr, int device_id));
-int	icu_setup __P((int intr, inthand2_t *func, void *arg, 
-		       u_int *maskptr, int flags));
-int	icu_unset __P((int intr, inthand2_t *handler));
-int	update_intr_masks __P((void));
 
 #endif /* KERNEL */