Move the declaration of the interrupt type from the driver structure

to the BUS_SETUP_INTR call.

8 files changed, 12 insertions, 21 deletions

diff --git a/sys/i386/eisa/3c5x9.c b/sys/i386/eisa/3c5x9.c
index 8a96166..81ba5a2 100644
--- a/sys/i386/eisa/3c5x9.c
+++ b/sys/i386/eisa/3c5x9.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: 3c5x9.c,v 1.10 1997/09/21 21:35:21 gibbs Exp $
+ *	$Id: 3c5x9.c,v 1.11 1999/04/18 15:50:33 peter Exp $
  */
 
 #include "eisa.h"
@@ -274,7 +274,7 @@ ep_eisa_attach(device_t dev)
 
 	ep_attach(sc);
 
-	bus_setup_intr(dev, irq, ep_intr, sc, &ih);
+	bus_setup_intr(dev, irq, INTR_TYPE_NET, ep_intr, sc, &ih);
 
 	return 0;
 
@@ -299,7 +299,6 @@ static device_method_t ep_eisa_methods[] = {
 static driver_t ep_eisa_driver = {
 	"ep",
 	ep_eisa_methods,
-	DRIVER_TYPE_NET,
 	1,			/* unused */
 };
 
diff --git a/sys/i386/eisa/adv_eisa.c b/sys/i386/eisa/adv_eisa.c
index 465f675..69a2a39 100644
--- a/sys/i386/eisa/adv_eisa.c
+++ b/sys/i386/eisa/adv_eisa.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_eisa.c,v 1.2 1998/12/22 18:14:09 gibbs Exp $
+ *	$Id: adv_eisa.c,v 1.3 1999/04/18 15:50:33 peter Exp $
  */
 
 #include "eisa.h"
@@ -316,7 +316,7 @@ adveisaattach(device_t dev)
 	/*
 	 * Enable our interrupt handler.
 	 */
-	bus_setup_intr(dev, irq, adv_intr, adv, &ih);
+	bus_setup_intr(dev, irq, INTR_TYPE_CAM, adv_intr, adv, &ih);
 
 	/* Attach sub-devices - always succeeds */
 	adv_attach(adv);
@@ -342,7 +342,6 @@ static device_method_t adv_eisa_methods[] = {
 static driver_t adv_eisa_driver = {
 	"adv",
 	adv_eisa_methods,
-	DRIVER_TYPE_CAM,
 	1,			/* unused */
 };
 
diff --git a/sys/i386/eisa/ahb.c b/sys/i386/eisa/ahb.c
index 6e0db43..86ba09b 100644
--- a/sys/i386/eisa/ahb.c
+++ b/sys/i386/eisa/ahb.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahb.c,v 1.10 1999/04/23 23:29:00 gibbs Exp $
+ *	$Id: ahb.c,v 1.11 1999/05/06 20:16:31 ken Exp $
  */
 
 #include "eisa.h"
@@ -369,7 +369,7 @@ ahbattach(device_t dev)
 		goto error_exit;
 
 	/* Enable our interrupt */
-	bus_setup_intr(dev, irq, ahbintr, ahb, &ih);
+	bus_setup_intr(dev, irq, INTR_TYPE_CAM, ahbintr, ahb, &ih);
 	return (0);
 
 error_exit:
@@ -1347,7 +1347,6 @@ static device_method_t ahb_eisa_methods[] = {
 static driver_t ahb_eisa_driver = {
 	"ahb",
 	ahb_eisa_methods,
-	DRIVER_TYPE_CAM,
 	1,			/* unused */
 };
 
diff --git a/sys/i386/eisa/ahc_eisa.c b/sys/i386/eisa/ahc_eisa.c
index fe02ca6..e0c0c51 100644
--- a/sys/i386/eisa/ahc_eisa.c
+++ b/sys/i386/eisa/ahc_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_eisa.c,v 1.6 1999/04/18 15:50:33 peter Exp $
+ *	$Id: ahc_eisa.c,v 1.7 1999/04/23 23:29:00 gibbs Exp $
  */
 
 #include "eisa.h"
@@ -465,7 +465,6 @@ static device_method_t ahc_eisa_methods[] = {
 static driver_t ahc_eisa_driver = {
 	"ahc",
 	ahc_eisa_methods,
-	DRIVER_TYPE_CAM,
 	1,			/* unused */
 };
 
diff --git a/sys/i386/eisa/bt_eisa.c b/sys/i386/eisa/bt_eisa.c
index 19cdd8c..fc369c8 100644
--- a/sys/i386/eisa/bt_eisa.c
+++ b/sys/i386/eisa/bt_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_eisa.c,v 1.5 1999/04/20 09:53:05 dfr Exp $
+ *	$Id: bt_eisa.c,v 1.6 1999/04/24 06:46:10 peter Exp $
  */
 
 #include "eisa.h"
@@ -333,7 +333,6 @@ static device_method_t bt_eisa_methods[] = {
 static driver_t bt_eisa_driver = {
 	"bt",
 	bt_eisa_methods,
-	DRIVER_TYPE_CAM,
 	sizeof(struct bt_softc),
 };
 
diff --git a/sys/i386/eisa/dpt_eisa.c b/sys/i386/eisa/dpt_eisa.c
index a8b2448..e38ea66 100644
--- a/sys/i386/eisa/dpt_eisa.c
+++ b/sys/i386/eisa/dpt_eisa.c
@@ -33,7 +33,7 @@
  */
 
 /*
- * $Id: dpt_eisa.c,v 1.4 1998/09/15 08:33:35 gibbs Exp $
+ * $Id: dpt_eisa.c,v 1.5 1999/04/18 15:50:33 peter Exp $
  */
 
 #include "eisa.h"
@@ -174,7 +174,7 @@ dpt_eisa_attach(device_t dev)
 
 	/* Register with the XPT */
 	dpt_attach(dpt);
-	bus_setup_intr(dev, irq, dpt_intr, dpt, &ih);
+	bus_setup_intr(dev, irq, INTR_TYPE_CAM, dpt_intr, dpt, &ih);
 
 	splx(s);
 
@@ -250,7 +250,6 @@ static device_method_t dpt_eisa_methods[] = {
 static driver_t dpt_eisa_driver = {
 	"dpt",
 	dpt_eisa_methods,
-	DRIVER_TYPE_CAM,
 	1,			/* unused */
 };
 
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index d219649..d6142e0 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.c,v 1.41 1999/04/19 13:34:25 peter Exp $
+ *	$Id: eisaconf.c,v 1.42 1999/05/06 22:17:26 peter Exp $
  */
 
 #include "opt_eisa.h"
@@ -132,7 +132,6 @@ static device_method_t mainboard_methods[] = {
 static driver_t mainboard_driver = {
 	"mainboard",
 	mainboard_methods,
-	DRIVER_TYPE_MISC,
 	1,
 };
 
@@ -483,7 +482,6 @@ static device_method_t eisa_methods[] = {
 static driver_t eisa_driver = {
 	"eisa",
 	eisa_methods,
-	DRIVER_TYPE_MISC,
 	1,			/* no softc */
 };
 
diff --git a/sys/i386/eisa/if_vx_eisa.c b/sys/i386/eisa/if_vx_eisa.c
index 808e369..03e50a3 100644
--- a/sys/i386/eisa/if_vx_eisa.c
+++ b/sys/i386/eisa/if_vx_eisa.c
@@ -164,7 +164,7 @@ vx_eisa_attach(device_t dev)
 
     vxattach(sc);
 
-    if (bus_setup_intr(dev, irq, vxintr, sc, &ih)) {
+    if (bus_setup_intr(dev, irq, INTR_TYPE_NET, vxintr, sc, &ih)) {
 	vxfree(sc);
 	goto bad;
     }
@@ -192,7 +192,6 @@ static device_method_t vx_eisa_methods[] = {
 static driver_t vx_eisa_driver = {
 	"vx",
 	vx_eisa_methods,
-	DRIVER_TYPE_NET,
 	1,			/* unused */
 };