From 5eba6c71a9eba5f3e1c482ebcd74db1ed1a56314 Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Tue, 8 Apr 1997 10:33:24 +0000
Subject: [PATCH] Enables lnc driver on PC-98 to support NEC SV-98/2-B06 PCI
 card. Cascade mode of DMA is disabled when PC98 is defined because PC-98
 doesn't support it.

---
 sys/conf/files.pc98      | 4 ++--
 sys/dev/lnc/if_lnc.c     | 3 +++
 sys/i386/isa/if_lnc.c    | 3 +++
 sys/pc98/conf/files.pc98 | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index fe417f7a83e..4bc343407b6 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$Id: files.pc98,v 1.19 1997/03/24 07:20:13 kato Exp $
+#	$Id: files.pc98,v 1.20 1997/04/03 09:55:26 kato Exp $
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
@@ -120,7 +120,7 @@ pc98/pc98/if_fe.c		optional	fe	device-driver
 #pc98/isa/if_ie.c		optional	ie	device-driver
 #pc98/isa/if_ix.c		optional	ix	device-driver
 #pc98/isa/if_le.c		optional	le	device-driver
-#pc98/isa/if_lnc.c		optional	lnc	device-driver
+i386/isa/if_lnc.c		optional	lnc	device-driver
 #i386/isa/if_sr.c		optional	sr	device-driver
 #pc98/isa/if_ze.c		optional	ze	device-driver
 i386/isa/if_zp.c		optional	zp	device-driver
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 51d77b13781..3da3a5a40d3 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -1160,6 +1160,8 @@ lnc_attach(struct isa_device * isa_dev)
 	int result = lnc_attach_sc (sc, unit);
 	if (result == 0)
 		return (0);
+
+#ifndef PC98
 	/*
 	 * XXX - is it safe to call isa_dmacascade() after if_attach() 
 	 *       and ether_ifattach() have been called in lnc_attach() ???
@@ -1168,6 +1170,7 @@ lnc_attach(struct isa_device * isa_dev)
 		 (sc->nic.ic != PCnet_32) &&
 		 (sc->nic.ic != PCnet_PCI))
 		isa_dmacascade(isa_dev->id_drq);
+#endif
 
 	return result;
 }
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 51d77b13781..3da3a5a40d3 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -1160,6 +1160,8 @@ lnc_attach(struct isa_device * isa_dev)
 	int result = lnc_attach_sc (sc, unit);
 	if (result == 0)
 		return (0);
+
+#ifndef PC98
 	/*
 	 * XXX - is it safe to call isa_dmacascade() after if_attach() 
 	 *       and ether_ifattach() have been called in lnc_attach() ???
@@ -1168,6 +1170,7 @@ lnc_attach(struct isa_device * isa_dev)
 		 (sc->nic.ic != PCnet_32) &&
 		 (sc->nic.ic != PCnet_PCI))
 		isa_dmacascade(isa_dev->id_drq);
+#endif
 
 	return result;
 }
diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98
index fe417f7a83e..4bc343407b6 100644
--- a/sys/pc98/conf/files.pc98
+++ b/sys/pc98/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$Id: files.pc98,v 1.19 1997/03/24 07:20:13 kato Exp $
+#	$Id: files.pc98,v 1.20 1997/04/03 09:55:26 kato Exp $
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
@@ -120,7 +120,7 @@ pc98/pc98/if_fe.c		optional	fe	device-driver
 #pc98/isa/if_ie.c		optional	ie	device-driver
 #pc98/isa/if_ix.c		optional	ix	device-driver
 #pc98/isa/if_le.c		optional	le	device-driver
-#pc98/isa/if_lnc.c		optional	lnc	device-driver
+i386/isa/if_lnc.c		optional	lnc	device-driver
 #i386/isa/if_sr.c		optional	sr	device-driver
 #pc98/isa/if_ze.c		optional	ze	device-driver
 i386/isa/if_zp.c		optional	zp	device-driver