From 6a4c2576dc38451d20c994bd9aaa237052ef5a6c Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sun, 28 May 2000 13:40:48 +0000
Subject: 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.

---
 sys/dev/cy/cy.c     | 11 ++++++++++-
 sys/dev/cy/cy_isa.c | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'sys/dev/cy')

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index dfeb69ac11e5c..52a8cf36892f5 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -78,6 +78,7 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
+#include <sys/bus.h>
 #include <machine/clock.h>
 #include <machine/ipl.h>
 #ifndef SMP
@@ -89,6 +90,10 @@
 #include <i386/isa/cyreg.h>
 #include <i386/isa/ic/cd1400.h>
 
+#ifndef COMPAT_OLDISA
+#error "The cy device requires the old isa compatibility shims"
+#endif
+
 #ifdef SMP
 #define disable_intr()	COM_DISABLE_INTR()
 #define enable_intr()	COM_ENABLE_INTR()
@@ -361,8 +366,12 @@ static	struct com_s	*p_com_addr[NSIO];
 #define	com_addr(unit)	(p_com_addr[unit])
 
 struct isa_driver	siodriver = {
-	sioprobe, sioattach, driver_name
+	INTR_TYPE_TTY | INTR_TYPE_FAST,
+	sioprobe,
+	sioattach,
+	driver_name
 };
+COMPAT_ISA_DRIVER(cy, cydriver);	/* XXX */
 
 static	d_open_t	sioopen;
 static	d_close_t	sioclose;
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index dfeb69ac11e5c..52a8cf36892f5 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -78,6 +78,7 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
+#include <sys/bus.h>
 #include <machine/clock.h>
 #include <machine/ipl.h>
 #ifndef SMP
@@ -89,6 +90,10 @@
 #include <i386/isa/cyreg.h>
 #include <i386/isa/ic/cd1400.h>
 
+#ifndef COMPAT_OLDISA
+#error "The cy device requires the old isa compatibility shims"
+#endif
+
 #ifdef SMP
 #define disable_intr()	COM_DISABLE_INTR()
 #define enable_intr()	COM_ENABLE_INTR()
@@ -361,8 +366,12 @@ static	struct com_s	*p_com_addr[NSIO];
 #define	com_addr(unit)	(p_com_addr[unit])
 
 struct isa_driver	siodriver = {
-	sioprobe, sioattach, driver_name
+	INTR_TYPE_TTY | INTR_TYPE_FAST,
+	sioprobe,
+	sioattach,
+	driver_name
 };
+COMPAT_ISA_DRIVER(cy, cydriver);	/* XXX */
 
 static	d_open_t	sioopen;
 static	d_close_t	sioclose;
-- 
cgit v1.3