From da78ae6c9675a977414b94dce05e10ea7794242c Mon Sep 17 00:00:00 2001
From: peter <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/ar/if_ar.c     | 15 +++++++++++++--
 sys/dev/ar/if_ar_isa.c | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'sys/dev/ar')

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 0c21d69..c9f3bbe 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -50,16 +50,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
+#include <sys/bus.h>
 
 #include <net/if.h>
 #ifdef NETGRAPH
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <i386/isa/if_ar.h>
 #else /* NETGRAPH */
@@ -74,6 +75,10 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/isa_device.h>
 
+#ifndef COMPAT_OLDISA
+#error "The ar device requires the old isa compatibility shims"
+#endif
+
 #ifndef NETGRAPH
 #include "sppp.h"
 #if NSPPP <= 0
@@ -218,7 +223,13 @@ static int irqtable[16] = {
 	7	/* 15 */
 };
 
-struct isa_driver ardriver = {arprobe, arattach_isa, "ar"};
+struct isa_driver ardriver = {
+	INTR_TYPE_NET,
+	arprobe,
+	arattach_isa,
+	"ar"
+};
+COMPAT_ISA_DRIVER(ar, ardriver);
 
 struct ar_hardc *arattach_pci(int unit, vm_offset_t mem_addr);
 void arintr_hc(struct ar_hardc *hc);
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 0c21d69..c9f3bbe 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -50,16 +50,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
+#include <sys/bus.h>
 
 #include <net/if.h>
 #ifdef NETGRAPH
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <i386/isa/if_ar.h>
 #else /* NETGRAPH */
@@ -74,6 +75,10 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/isa_device.h>
 
+#ifndef COMPAT_OLDISA
+#error "The ar device requires the old isa compatibility shims"
+#endif
+
 #ifndef NETGRAPH
 #include "sppp.h"
 #if NSPPP <= 0
@@ -218,7 +223,13 @@ static int irqtable[16] = {
 	7	/* 15 */
 };
 
-struct isa_driver ardriver = {arprobe, arattach_isa, "ar"};
+struct isa_driver ardriver = {
+	INTR_TYPE_NET,
+	arprobe,
+	arattach_isa,
+	"ar"
+};
+COMPAT_ISA_DRIVER(ar, ardriver);
 
 struct ar_hardc *arattach_pci(int unit, vm_offset_t mem_addr);
 void arintr_hc(struct ar_hardc *hc);
-- 
cgit v1.1