Move the declaration of the interrupt type from the driver structure

to the BUS_SETUP_INTR call.

5 files changed, 11 insertions, 16 deletions

diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c
index 1d7ee62..8942681 100644
--- a/sys/dev/atkbdc/atkbd_atkbdc.c
+++ b/sys/dev/atkbdc/atkbd_atkbdc.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: atkbd_isa.c,v 1.2 1999/03/10 10:36:49 yokota Exp $
+ * $Id: atkbd_isa.c,v 1.3 1999/04/16 21:22:34 peter Exp $
  */
 
 #include "atkbd.h"
@@ -64,7 +64,6 @@ static device_method_t atkbd_methods[] = {
 static driver_t atkbd_driver = {
 	ATKBD_DRIVER_NAME,
 	atkbd_methods,
-	DRIVER_TYPE_TTY,
 	sizeof(atkbd_softc_t),
 };
 
@@ -111,8 +110,8 @@ atkbdattach(device_t dev)
 	/* declare our interrupt handler */
 	res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, irq, irq, 1,
 				 RF_SHAREABLE | RF_ACTIVE);
-	BUS_SETUP_INTR(device_get_parent(dev), dev, res, atkbd_isa_intr, sc,
-		       &ih);
+	BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY,
+		       atkbd_isa_intr, sc, &ih);
 
 	return 0;
 }
diff --git a/sys/dev/atkbdc/atkbd_isa.c b/sys/dev/atkbdc/atkbd_isa.c
index 1d7ee62..8942681 100644
--- a/sys/dev/atkbdc/atkbd_isa.c
+++ b/sys/dev/atkbdc/atkbd_isa.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: atkbd_isa.c,v 1.2 1999/03/10 10:36:49 yokota Exp $
+ * $Id: atkbd_isa.c,v 1.3 1999/04/16 21:22:34 peter Exp $
  */
 
 #include "atkbd.h"
@@ -64,7 +64,6 @@ static device_method_t atkbd_methods[] = {
 static driver_t atkbd_driver = {
 	ATKBD_DRIVER_NAME,
 	atkbd_methods,
-	DRIVER_TYPE_TTY,
 	sizeof(atkbd_softc_t),
 };
 
@@ -111,8 +110,8 @@ atkbdattach(device_t dev)
 	/* declare our interrupt handler */
 	res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, irq, irq, 1,
 				 RF_SHAREABLE | RF_ACTIVE);
-	BUS_SETUP_INTR(device_get_parent(dev), dev, res, atkbd_isa_intr, sc,
-		       &ih);
+	BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY,
+		       atkbd_isa_intr, sc, &ih);
 
 	return 0;
 }
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index 8e5a62b..5342c52 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.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: atkbdc_isa.c,v 1.2 1999/04/16 23:39:15 peter Exp $
+ * $Id: atkbdc_isa.c,v 1.3 1999/05/08 20:25:38 peter Exp $
  */
 
 #include "atkbdc.h"
@@ -82,7 +82,6 @@ static device_method_t atkbdc_methods[] = {
 static driver_t atkbdc_driver = {
 	ATKBDC_DRIVER_NAME,
 	atkbdc_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(atkbdc_softc_t *),
 };
 
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index 8e5a62b..5342c52 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.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: atkbdc_isa.c,v 1.2 1999/04/16 23:39:15 peter Exp $
+ * $Id: atkbdc_isa.c,v 1.3 1999/05/08 20:25:38 peter Exp $
  */
 
 #include "atkbdc.h"
@@ -82,7 +82,6 @@ static device_method_t atkbdc_methods[] = {
 static driver_t atkbdc_driver = {
 	ATKBDC_DRIVER_NAME,
 	atkbdc_methods,
-	DRIVER_TYPE_MISC,
 	sizeof(atkbdc_softc_t *),
 };
 
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index 70361ff..c6f69a7 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.5 1999/04/18 15:12:11 peter Exp $
+ * $Id: psm.c,v 1.6 1999/05/07 10:10:40 phk Exp $
  */
 
 /*
@@ -305,7 +305,6 @@ static device_method_t psm_methods[] = {
 static driver_t psm_driver = {
     "psm",
     psm_methods,
-    DRIVER_TYPE_TTY,
     sizeof(struct psm_softc),
 };
 
@@ -1082,8 +1081,8 @@ psmattach(device_t dev)
     BUS_READ_IVAR(device_get_parent(dev), dev, KBDC_IVAR_IRQ, &irq);
     res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, irq, irq, 1,
 			     RF_SHAREABLE | RF_ACTIVE);
-    BUS_SETUP_INTR(device_get_parent(dev), dev, res, psmintr, sc,
-		   &ih);
+    BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY,
+		   psmintr, sc, &ih);
 
     return (0);
 }