Move the declaration of the interrupt type from the driver structure

to the BUS_SETUP_INTR call.

23 files changed, 40 insertions, 57 deletions

diff --git a/sys/alpha/isa/isa.c b/sys/alpha/isa/isa.c
index db1104c..6e01cec 100644
--- a/sys/alpha/isa/isa.c
+++ b/sys/alpha/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa.c,v 1.10 1999/04/16 21:21:37 peter Exp $
+ *	$Id: isa.c,v 1.11 1999/04/21 07:26:23 peter Exp $
  */
 
 #include <sys/param.h>
@@ -105,7 +105,6 @@ static device_method_t isa_methods[] = {
 static driver_t isa_driver = {
 	"isa",
 	isa_methods,
-	DRIVER_TYPE_MISC,
 	1,			/* no softc */
 };
 
@@ -680,7 +679,7 @@ isa_handle_intr(void *arg)
 
 int
 isa_setup_intr(device_t dev, device_t child,
-	       struct resource *irq,
+	       struct resource *irq, int flags,
 	       driver_intr_t *intr, void *arg, void **cookiep)
 {
 	struct isa_intr *ii;
diff --git a/sys/alpha/isa/isavar.h b/sys/alpha/isa/isavar.h
index ce0e8ce..0eee66e 100644
--- a/sys/alpha/isa/isavar.h
+++ b/sys/alpha/isa/isavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: isavar.h,v 1.1 1999/04/16 21:21:37 peter Exp $
  */
 
 /*
@@ -33,7 +33,8 @@
 void isa_init_intr(void);
 struct resource *isa_alloc_intr(device_t bus, device_t child, int irq);
 int isa_release_intr(device_t bus, device_t child, struct resource *r);
-int isa_setup_intr(device_t dev, device_t child, struct resource *irq,
+int isa_setup_intr(device_t dev, device_t child,
+		   struct resource *irq, int flags,
 		   driver_intr_t *intr, void *arg, void **cookiep);
 int isa_teardown_intr(device_t dev, device_t child, struct resource *irq,
 		      void *cookie);
diff --git a/sys/alpha/isa/mcclock_isa.c b/sys/alpha/isa/mcclock_isa.c
index 08345f2..3c6ca80 100644
--- a/sys/alpha/isa/mcclock_isa.c
+++ b/sys/alpha/isa/mcclock_isa.c
@@ -1,4 +1,4 @@
-/* $Id: mcclock_isa.c,v 1.2 1998/07/22 08:30:25 dfr Exp $ */
+/* $Id: mcclock_isa.c,v 1.3 1998/07/31 09:20:35 dfr Exp $ */
 /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */
 
 /*
@@ -68,7 +68,6 @@ static device_method_t mcclock_isa_methods[] = {
 static driver_t mcclock_isa_driver = {
 	"mcclock",
 	mcclock_isa_methods,
-	DRIVER_TYPE_MISC,
 	1,			/* XXX no softc */
 };
 
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index fb86dc9..9516894 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apecs.c,v 1.5 1999/01/18 20:15:07 gallatin Exp $
+ *	$Id: apecs.c,v 1.6 1999/04/16 21:21:38 peter Exp $
  */
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -450,8 +450,9 @@ static struct resource *apecs_alloc_resource(device_t bus, device_t child,
 					     u_int flags);
 static int apecs_release_resource(device_t bus, device_t child,
 				  int type, int rid, struct resource *r);
-static int apecs_setup_intr(device_t dev, device_t child, struct resource *irq,
-			  driver_intr_t *intr, void *arg, void **cookiep);
+static int apecs_setup_intr(device_t dev, device_t child,
+			    struct resource *irq, int flags,
+			    driver_intr_t *intr, void *arg, void **cookiep);
 static int apecs_teardown_intr(device_t dev, device_t child,
 			     struct resource *irq, void *cookie);
 
@@ -474,7 +475,6 @@ static device_method_t apecs_methods[] = {
 static driver_t apecs_driver = {
 	"apecs",
 	apecs_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct apecs_softc),
 };
 
@@ -563,7 +563,7 @@ apecs_release_resource(device_t bus, device_t child, int type, int rid,
 
 static int
 apecs_setup_intr(device_t dev, device_t child,
-	       struct resource *irq,
+	       struct resource *irq, int flags,
 	       driver_intr_t *intr, void *arg, void **cookiep)
 {
 	int error;
@@ -573,7 +573,8 @@ apecs_setup_intr(device_t dev, device_t child,
 	 *  controller, so we need to special case it 
 	 */
 	if(hwrpb->rpb_type == ST_DEC_2100_A50)
-		return isa_setup_intr(dev, child, irq, intr, arg, cookiep);
+		return isa_setup_intr(dev, child, irq, flags,
+				      intr, arg, cookiep);
 
 	error = rman_activate_resource(irq);
 	if (error)
diff --git a/sys/alpha/pci/apecs_pci.c b/sys/alpha/pci/apecs_pci.c
index fb0b339..cb05f8d 100644
--- a/sys/alpha/pci/apecs_pci.c
+++ b/sys/alpha/pci/apecs_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: apecs_pci.c,v 1.1 1999/04/16 21:21:38 peter Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +66,6 @@ static device_method_t apecs_pcib_methods[] = {
 static driver_t apecs_pcib_driver = {
 	"pcib",
 	apecs_pcib_methods,
-	DRIVER_TYPE_MISC,
 	1,
 };
 
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c
index e967493..ca7032a 100644
--- a/sys/alpha/pci/cia.c
+++ b/sys/alpha/pci/cia.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cia.c,v 1.15 1999/03/28 17:52:17 dfr Exp $
+ *	$Id: cia.c,v 1.16 1999/04/16 21:21:39 peter Exp $
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -644,7 +644,8 @@ cia_write_hae(u_int64_t hae)
 
 static int cia_probe(device_t dev);
 static int cia_attach(device_t dev);
-static int cia_setup_intr(device_t dev, device_t child, struct resource *irq,
+static int cia_setup_intr(device_t dev, device_t child,
+			  struct resource *irq, int flags,
 			  driver_intr_t *intr, void *arg, void **cookiep);
 static int cia_teardown_intr(device_t dev, device_t child,
 			     struct resource *irq, void *cookie);
@@ -669,7 +670,6 @@ static device_method_t cia_methods[] = {
 static driver_t cia_driver = {
 	"cia",
 	cia_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct cia_softc),
 };
 
@@ -815,7 +815,7 @@ cia_attach(device_t dev)
 
 static int
 cia_setup_intr(device_t dev, device_t child,
-	       struct resource *irq,
+	       struct resource *irq, int flags,
 	       driver_intr_t *intr, void *arg, void **cookiep)
 {
 	int error;
diff --git a/sys/alpha/pci/cia_pci.c b/sys/alpha/pci/cia_pci.c
index e77c3b4..9b0c7d1 100644
--- a/sys/alpha/pci/cia_pci.c
+++ b/sys/alpha/pci/cia_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: cia_pci.c,v 1.1 1999/04/16 21:21:39 peter Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +66,6 @@ static device_method_t cia_pcib_methods[] = {
 static driver_t cia_pcib_driver = {
 	"pcib",
 	cia_pcib_methods,
-	DRIVER_TYPE_MISC,
 	1,
 };
 
diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c
index b60fb3e..1c86d94 100644
--- a/sys/alpha/pci/lca.c
+++ b/sys/alpha/pci/lca.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lca.c,v 1.5 1998/12/04 22:54:42 archie Exp $
+ *	$Id: lca.c,v 1.6 1999/04/16 21:21:39 peter Exp $
  */
 
 #include <sys/param.h>
@@ -360,7 +360,6 @@ static device_method_t lca_methods[] = {
 static driver_t lca_driver = {
 	"lca",
 	lca_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct lca_softc),
 };
 
diff --git a/sys/alpha/pci/lca_pci.c b/sys/alpha/pci/lca_pci.c
index 61e3525..7e84de4 100644
--- a/sys/alpha/pci/lca_pci.c
+++ b/sys/alpha/pci/lca_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: lca_pci.c,v 1.1 1999/04/16 21:21:39 peter Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +66,6 @@ static device_method_t lca_pcib_methods[] = {
 static driver_t lca_pcib_driver = {
 	"pcib",
 	lca_pcib_methods,
-	DRIVER_TYPE_MISC,
 	1,
 };
 
diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c
index f0c0eb2..1479e12 100644
--- a/sys/alpha/pci/pcibus.c
+++ b/sys/alpha/pci/pcibus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.10 1999/04/19 08:55:11 dfr Exp $
+ * $Id: pcibus.c,v 1.11 1999/04/21 07:26:24 peter Exp $
  *
  */
 
@@ -149,7 +149,8 @@ alpha_platform_setup_ide_intr(int chan, driver_intr_t *fn, void *arg)
 		struct resource *res;
 		res = isa_alloc_intr(0, 0, irqs[chan]);
 		if (res)
-			return isa_setup_intr(0, 0, res, fn, arg, &junk);
+			return isa_setup_intr(0, 0, res, INTR_TYPE_BIO,
+					      fn, arg, &junk);
 		else
 			return ENOMEM;
 	}
diff --git a/sys/alpha/tc/esp.c b/sys/alpha/tc/esp.c
index 1a860c2..336e0fb 100644
--- a/sys/alpha/tc/esp.c
+++ b/sys/alpha/tc/esp.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: esp.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
 /*	$NetBSD: esp.c,v 1.8.4.2 1996/09/10 17:28:16 cgd Exp $	*/
 
 /*
@@ -107,7 +107,6 @@ static device_method_t esp_methods[] = {
 static driver_t esp_driver = {
 	"esp",
 	esp_methods,
-	DRIVER_TYPE_BIO,
 	sizeof(struct esp_softc),
 };
 
diff --git a/sys/alpha/tc/if_le_ioasic.c b/sys/alpha/tc/if_le_ioasic.c
index fe3eacc..d672e77 100644
--- a/sys/alpha/tc/if_le_ioasic.c
+++ b/sys/alpha/tc/if_le_ioasic.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: if_le_ioasic.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
 /*	$NetBSD: if_le_ioasic.c,v 1.10 1998/01/19 02:49:48 thorpej Exp $	*/
 
 /*
@@ -79,7 +79,6 @@ static device_method_t le_ioasic_methods[] = {
 static driver_t le_ioasic_driver = {
 	"le",
 	le_ioasic_methods,
-	DRIVER_TYPE_NET,
 	sizeof(struct le_softc),
 };
 
diff --git a/sys/alpha/tc/ioasic.c b/sys/alpha/tc/ioasic.c
index 5c862a9..175f2b8 100644
--- a/sys/alpha/tc/ioasic.c
+++ b/sys/alpha/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ioasic.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
 /* from $NetBSD: ioasic.c,v 1.19 1998/05/27 00:18:13 thorpej Exp $ */
 
 /*-
@@ -117,7 +117,6 @@ static device_method_t ioasic_methods[] = {
 static driver_t ioasic_driver = {
 	"ioasic",
 	ioasic_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct ioasic_softc),
 };
 
diff --git a/sys/alpha/tc/mcclock_ioasic.c b/sys/alpha/tc/mcclock_ioasic.c
index 2dee0c0..813d60d 100644
--- a/sys/alpha/tc/mcclock_ioasic.c
+++ b/sys/alpha/tc/mcclock_ioasic.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: mcclock_ioasic.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
 /* $NetBSD: mcclock_ioasic.c,v 1.8 1997/09/02 13:20:14 thorpej Exp $ */
 
 /*
@@ -90,7 +90,6 @@ static device_method_t mcclock_ioasic_methods[] = {
 static driver_t mcclock_ioasic_driver = {
 	"mcclock",
 	mcclock_ioasic_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct mcclock_ioasic_softc),
 };
 
diff --git a/sys/alpha/tc/tc.c b/sys/alpha/tc/tc.c
index dd99f14..3c6169d 100644
--- a/sys/alpha/tc/tc.c
+++ b/sys/alpha/tc/tc.c
@@ -1,4 +1,4 @@
-/* $Id: tc.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $Id: tc.c,v 1.2 1999/04/16 21:21:40 peter Exp $ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
@@ -88,7 +88,6 @@ static device_method_t tc_methods[] = {
 static driver_t tc_driver = {
 	"tc",
 	tc_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct tc_softc),
 };
 
diff --git a/sys/alpha/tc/tcasic.c b/sys/alpha/tc/tcasic.c
index eeb6953..b06db14 100644
--- a/sys/alpha/tc/tcasic.c
+++ b/sys/alpha/tc/tcasic.c
@@ -1,4 +1,4 @@
-/* $Id: tcasic.c,v 1.1 1998/08/20 08:27:11 dfr Exp $ */
+/* $Id: tcasic.c,v 1.2 1999/04/16 21:21:41 peter Exp $ */
 /* from $NetBSD: tcasic.c,v 1.23 1998/05/14 00:01:31 thorpej Exp $ */
 
 /*
@@ -69,7 +69,6 @@ static device_method_t tcasic_methods[] = {
 static driver_t tcasic_driver = {
 	"tcasic",
 	tcasic_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct tcasic_softc),
 };
 
diff --git a/sys/alpha/tc/tcds.c b/sys/alpha/tc/tcds.c
index 37a3da9..1229c7e 100644
--- a/sys/alpha/tc/tcds.c
+++ b/sys/alpha/tc/tcds.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: tcds.c,v 1.1 1998/08/20 08:27:11 dfr Exp $ */
 /* from $NetBSD: tcds.c,v 1.25 1998/05/26 23:43:05 thorpej Exp $ */
 
 /*-
@@ -123,7 +123,6 @@ static device_method_t tcds_methods[] = {
 static driver_t tcds_driver = {
 	"tcds",
 	tcds_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct tcds_softc),
 };
 
diff --git a/sys/alpha/tlsb/dwlpx.c b/sys/alpha/tlsb/dwlpx.c
index 5a2a5cd..d558b51 100644
--- a/sys/alpha/tlsb/dwlpx.c
+++ b/sys/alpha/tlsb/dwlpx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dwlpx.c,v 1.7 1998/11/15 18:25:16 dfr Exp $
+ *	$Id: dwlpx.c,v 1.8 1999/04/16 21:21:42 peter Exp $
  */
 
 #include "opt_simos.h"
@@ -268,7 +268,6 @@ static device_method_t dwlpx_methods[] = {
 static driver_t dwlpx_driver = {
 	"dwlpx",
 	dwlpx_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct dwlpx_softc),
 };
 
@@ -303,7 +302,7 @@ dwlpx_attach(device_t dev)
 
 	*(u_int32_t*) (regs + PCIA_CTL(0)) = 1;	/* Type1 config cycles */
 
-	return BUS_SETUP_INTR(parent, dev, NULL, dwlpx_intr, 0, &intr);
+	return BUS_SETUP_INTR(parent, dev, NULL, INTR_TYPE_MISC, dwlpx_intr, 0, &intr);
 
 	return 0;
 }
diff --git a/sys/alpha/tlsb/gbus.c b/sys/alpha/tlsb/gbus.c
index f98a3bd..2d4ad30 100644
--- a/sys/alpha/tlsb/gbus.c
+++ b/sys/alpha/tlsb/gbus.c
@@ -101,7 +101,6 @@ static device_method_t gbus_methods[] = {
 static driver_t gbus_driver = {
 	"gbus",
 	gbus_methods,
-	DRIVER_TYPE_MISC,
 	1,			/* no softc */
 };
 
diff --git a/sys/alpha/tlsb/kftxx.c b/sys/alpha/tlsb/kftxx.c
index d85b202..bfcd2e0 100644
--- a/sys/alpha/tlsb/kftxx.c
+++ b/sys/alpha/tlsb/kftxx.c
@@ -1,4 +1,4 @@
-/* $Id: kftxx.c,v 1.3 1998/07/12 16:23:17 dfr Exp $ */
+/* $Id: kftxx.c,v 1.4 1998/11/15 18:25:16 dfr Exp $ */
 /* $NetBSD: kftxx.c,v 1.9 1998/05/14 00:01:32 thorpej Exp $ */
 
 /*
@@ -98,7 +98,6 @@ static device_method_t kft_methods[] = {
 static driver_t kft_driver = {
 	"kft",
 	kft_methods,
-	DRIVER_TYPE_MISC,
 	1,			/* no softc */
 };
 
diff --git a/sys/alpha/tlsb/mcclock_tlsb.c b/sys/alpha/tlsb/mcclock_tlsb.c
index d0d017c..97dec5b 100644
--- a/sys/alpha/tlsb/mcclock_tlsb.c
+++ b/sys/alpha/tlsb/mcclock_tlsb.c
@@ -1,4 +1,4 @@
-/* $Id: mcclock_tlsb.c,v 1.2 1998/06/14 13:45:26 dfr Exp $ */
+/* $Id: mcclock_tlsb.c,v 1.3 1998/07/31 09:20:01 dfr Exp $ */
 /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */
 
 /*
@@ -81,7 +81,6 @@ static device_method_t mcclock_tlsb_methods[] = {
 static driver_t mcclock_tlsb_driver = {
 	"mcclock",
 	mcclock_tlsb_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct mcclock_tlsb_softc),
 };
 
diff --git a/sys/alpha/tlsb/tlsb.c b/sys/alpha/tlsb/tlsb.c
index 00aff9a..f1097b2 100644
--- a/sys/alpha/tlsb/tlsb.c
+++ b/sys/alpha/tlsb/tlsb.c
@@ -96,7 +96,7 @@ static int tlsb_probe(device_t dev);
 static void tlsb_print_child(device_t dev, device_t child);
 static int tlsb_read_ivar(device_t dev, device_t child, int which, u_long* result);
 static int tlsb_setup_intr(device_t dev, device_t child,
-			   struct resource *irq,
+			   struct resource *irq, int flags,
 			   driver_intr_t *intr, void *arg, void **cookiep);
 static int tlsb_teardown_intr(device_t dev, device_t child,
 			      struct resource *irq, void *cookie);
@@ -121,7 +121,6 @@ static device_method_t tlsb_methods[] = {
 static driver_t tlsb_driver = {
 	"tlsb",
 	tlsb_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct tlsb_softc),
 };
 
@@ -270,7 +269,7 @@ tlsb_read_ivar(device_t dev, device_t child,
 
 static int
 tlsb_setup_intr(device_t dev, device_t child,
-		struct resource *irq,
+		struct resource *irq, int flags,
 		driver_intr_t *intr, void *arg, void **cookiep)
 {
 	struct tlsb_softc* sc = device_get_softc(dev);
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 997658c..9ea89d3 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zs_tlsb.c,v 1.8 1999/04/27 11:13:45 phk Exp $
+ *	$Id: zs_tlsb.c,v 1.9 1999/05/07 10:09:38 phk Exp $
  */
 /*
  * This driver is a hopeless hack to get the SimOS console working.  A real
@@ -114,7 +114,6 @@ static device_method_t zs_methods[] = {
 static driver_t zs_driver = {
 	"zs",
 	zs_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct zs_softc),
 };
 
@@ -415,7 +414,6 @@ static device_method_t zsc_tlsb_methods[] = {
 static driver_t zsc_tlsb_driver = {
 	"zsc",
 	zsc_tlsb_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(struct zsc_softc),
 };
 
@@ -466,8 +464,8 @@ zsc_tlsb_attach(device_t dev)
 	sc->sc_b = ZS_SOFTC(1);
 
 	/* XXX should use resource argument to communicate vector */
-	return BUS_SETUP_INTR(parent, dev, NULL, zsc_tlsb_intr, sc,
-			      &sc->intr);
+	return BUS_SETUP_INTR(parent, dev, NULL, INTR_TYPE_TTY,
+			      zsc_tlsb_intr, sc, &sc->intr);
 
 	return 0;
 }