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/ctx.c b/sys/i386/isa/ctx.c
index 898b298..b8a2ea2 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -112,14 +112,20 @@
 
 #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/isa_device.h>
 #include <i386/isa/ctxreg.h>
 #include <machine/ioctl_ctx.h>
 #include <machine/md_var.h>
 
+#ifndef COMPAT_OLDISA
+#error "The ctx device requires the old isa compatibility shims"
+#endif
+
 static int     waitvb(int port);
 
 /* state flags */
@@ -129,7 +135,13 @@ static int     waitvb(int port);
 
 static int	ctxprobe __P((struct isa_device *devp));
 static int	ctxattach __P((struct isa_device *devp));
-struct isa_driver ctxdriver = {ctxprobe, ctxattach, "ctx"};
+struct isa_driver ctxdriver = {
+	INTR_TYPE_MISC,
+	ctxprobe,
+	ctxattach,
+	"ctx"
+};
+COMPAT_ISA_DRIVER(ctx, ctxdriver);
 
 static	d_open_t	ctxopen;
 static	d_close_t	ctxclose;