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, 13 insertions, 1 deletions

diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index f78ddd6..1463373 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -23,13 +23,19 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
+#include <sys/bus.h>
 #include <i386/isa/gpibreg.h>
 #include <i386/isa/gpib.h>
 #include <i386/isa/isa_device.h>
 
+#ifndef COMPAT_OLDISA
+#error "The gpib device requires the old isa compatibility shims"
+#endif
+
 #define MIN(a,b) ((a < b) ? a : b)
 
 #define GPIBPRI  (PZERO+8)|PCATCH
@@ -57,7 +63,13 @@ static char spoll(unsigned char device);
 static int gpprobe(struct isa_device *dvp);
 static int gpattach(struct isa_device *dvp);
 
-struct   isa_driver gpdriver = {gpprobe, gpattach, "gp"};
+struct   isa_driver gpdriver = {
+	INTR_TYPE_TTY,
+	gpprobe,
+	gpattach,
+	"gp"
+};
+COMPAT_ISA_DRIVER(gp, gpdriver);
 
 static	d_open_t	gpopen;
 static	d_close_t	gpclose;