Mass update of isa drivers using compatability shims to use

COMPAT_ISA_DRIVER() so that we can get rid of the evil isa_compat.h table.

1 files changed, 11 insertions, 2 deletions

diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index e560dda..212c064 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -142,12 +142,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/kernel.h>
+#include <sys/conf.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
 #include <sys/select.h>
 #include <sys/poll.h>
+#include <sys/bus.h>
 #define MIN(a,b)	((a)<(b)?(a):(b))
 
 #ifdef HIRESTIME
@@ -156,6 +157,10 @@
 
 #include <i386/isa/isa_device.h>
 
+#ifndef COMPAT_OLDISA
+#error "The tw device requires the old isa compatibility shims"
+#endif
+
 /*
  * Transmission is done by calling write() to send three byte packets of data.
  * The first byte contains a four bit house code (0=A to 15=P).
@@ -207,8 +212,12 @@ static int twprobe(struct isa_device *idp);
 static int twattach(struct isa_device *idp);
 
 struct isa_driver twdriver = {
-  twprobe, twattach, "tw"
+	INTR_TYPE_TTY,
+	twprobe,
+	twattach,
+	"tw"
 };
+COMPAT_ISA_DRIVER(tw, twdriver);
 
 static	d_open_t	twopen;
 static	d_close_t	twclose;