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.

2 files changed, 22 insertions, 2 deletions

diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 3755c43..5b778ad 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -52,6 +52,7 @@
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/bus.h>
 
 #include <machine/clock.h>
 
@@ -60,6 +61,10 @@
 
 #include <i386/isa/isa_device.h>
 
+#ifndef COMPAT_OLDISA
+#error "The dgb device requires the old isa compatibility shims"
+#endif
+
 #include <gnu/i386/isa/dgbios.h>
 #include <gnu/i386/isa/dgfep.h>
 
@@ -197,8 +202,13 @@ static	void	disc_optim	__P((struct tty	*tp, struct termios *t));
 
 
 struct isa_driver	dgbdriver = {
-	dgbprobe, dgbattach, "dgb",0
+	INTR_TYPE_TTY,
+	dgbprobe,
+	dgbattach,
+	"dgb",
+	0
 };
+COMPAT_ISA_DRIVER(dgb, dgbdriver);
 
 static	d_open_t	dgbopen;
 static	d_close_t	dgbclose;
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index 18122f0..a31ff9c 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -55,6 +55,7 @@
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/bus.h>
 
 #include <machine/clock.h>
 
@@ -63,6 +64,10 @@
 
 #include <i386/isa/isa_device.h>
 
+#ifndef COMPAT_OLDISA
+#error "The dgm device requires the old isa compatibility shims"
+#endif
+
 #include <gnu/i386/isa/dgmfep.h>
 #include <gnu/i386/isa/dgmbios.h>
 #include <gnu/i386/isa/dgmreg.h>
@@ -200,8 +205,13 @@ static	void	disc_optim	__P((struct tty	*tp, struct termios *t));
 
 
 struct isa_driver	dgmdriver = {
-	dgmprobe, dgmattach, "dgm",0
+	INTR_TYPE_TTY,
+	dgmprobe,
+	dgmattach,
+	"dgm",
+	0
 };
+COMPAT_ISA_DRIVER(dgm, dgmdriver);
 
 static	d_open_t	dgmopen;
 static	d_close_t	dgmclose;