- Remove the inthand2_t type and use the equivalent driver_intr_t type from

  newbus for referencing device interrupt handlers.
- Move the 'struct intrec' type which describes interrupt sources into
  sys/interrupt.h instead of making it just be a x86 structure.
- Don't create 'ithd' and 'intrec' typedefs, instead, just use 'struct ithd'
  and 'struct intrec'
- Move the code to translate new-bus interrupt flags into an interrupt thread
  priority out of the x86 nexus code and into a MI ithread_priority()
  function in sys/kern/kern_intr.c.
- Remove now-uneeded x86-specific headers from sys/dev/ata/ata-all.c and
  sys/pci/pci_compat.c.

1 files changed, 8 insertions, 8 deletions

diff --git a/sys/i386/isa/ithread.c b/sys/i386/isa/ithread.c
index 9bc66dc..2712353 100644
--- a/sys/i386/isa/ithread.c
+++ b/sys/i386/isa/ithread.c
@@ -36,6 +36,7 @@
 #include "isa.h"
 
 #include <sys/param.h>
+#include <sys/bus.h>
 #include <sys/rtprio.h>			/* change this name XXX */
 #ifndef SMP
 #include <machine/lock.h>
@@ -53,7 +54,6 @@
 #include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/segments.h>
-#include <sys/bus.h>
 
 #if defined(APIC_IO)
 #include <machine/smp.h>
@@ -103,7 +103,7 @@ void
 sched_ithd(void *cookie)
 {
 	int irq = (int) cookie;		/* IRQ we're handling */
-	ithd *ir = ithds[irq];		/* and the process that does it */
+	struct ithd *ir = ithds[irq];	/* and the process that does it */
 
 	/* This used to be in icu_vector.s */
 	/*
@@ -127,7 +127,7 @@ sched_ithd(void *cookie)
 	 * go away once we have light-weight interrupt handlers.
 	 */
 	if (db_active) {
-		intrec	*ih;	/* and our interrupt handler chain */
+		struct intrec	*ih;	/* and our interrupt handler chain */
 #if 0
 		membar_unlock(); /* push out "it_need=0" */
 #endif
@@ -183,8 +183,8 @@ if (irq < NHWI && (irq & 7) != 0)
 void
 ithd_loop(void *dummy)
 {
-	ithd *me;			/* our thread context */
-	intrec *ih;			/* and our interrupt handler chain */
+	struct ithd *me;		/* our thread context */
+	struct intrec *ih;		/* and our interrupt handler chain */
 
 	me = curproc->p_ithd;		/* point to myself */
 
@@ -254,8 +254,8 @@ start_softintr(void *dummy)
 {
 	int error;
 	struct proc *p;
-	ithd *softintr;			/* descriptor for the "IRQ" */
-	intrec *idesc;			/* descriptor for this handler */
+	struct ithd *softintr;		/* descriptor for the "IRQ" */
+	struct intrec *idesc;		/* descriptor for this handler */
 	char *name = "sintr";		/* name for idesc */
 	int i;
 
@@ -304,7 +304,7 @@ void
 intr_soft(void *dummy)
 {
 	int i;
-	ithd *me;			/* our thread context */
+	struct ithd *me;		/* our thread context */
 
 	me = curproc->p_ithd;		/* point to myself */