split le driver, add iy driver

diff --git a/sys/conf/files b/sys/conf/files
index 94cc053..b33e827 100644 (file)
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,5 +1,5 @@
-#      $OpenBSD: files,v 1.19 1996/05/05 12:42:09 deraadt Exp $
-#      $NetBSD: files,v 1.83 1996/04/25 02:18:25 thorpej Exp $
+#      $OpenBSD: files,v 1.20 1996/05/10 12:33:26 deraadt Exp $
+#      $NetBSD: files,v 1.84 1996/05/07 08:56:54 mycroft Exp $
 
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
@@ -34,6 +34,10 @@ define       aic7xxx         # Adaptec aic7770 and aic7870 SCSI controllers
 device ep: ether, ifnet
 file   dev/ic/elink3.c         ep
 
+# LANCE and PCnet Ethernet controllers
+device le: ether, ifnet
+file   dev/ic/am7990.c         le
+
 # Attributes which machine-independent bus support can be attached to.
 # These should be defined here, because some of these busses can have
 # devices which provide these attributes, and we'd like to avoid hairy

diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 4abfe81..96a8fad 100644 (file)
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,5 +1,5 @@
-#      $OpenBSD: files.isa,v 1.15 1996/05/05 12:42:34 deraadt Exp $
-#      $NetBSD: files.isa,v 1.18 1996/04/25 02:15:42 thorpej Exp $
+#      $OpenBSD: files.isa,v 1.16 1996/05/10 12:33:24 deraadt Exp $
+#      $NetBSD: files.isa,v 1.20 1996/05/07 01:50:09 thorpej Exp $
 #
 # Config.new file and device description for machine-independent ISA code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -179,6 +179,12 @@ device     ie: ether, ifnet, elink
 attach ie at isa
 file   dev/isa/if_ie.c                 ie
 
+# Intel i82595-based boards.
+# (Intel EtherExpress PRO)
+device  iy: ether, ifnet         
+attach iy at isa
+file    dev/isa/if_iy.c                        iy
+
 # XXX ???
 # XXX NOT IN TREE?
 #device        ix: ether, ifnet
@@ -187,10 +193,9 @@ file       dev/isa/if_ie.c                 ie
 
 # AMD am7990 (Lance) -based boards
 # (BICC Isolan, NE2100, DEPCA)
-# XXX conflicts with alpha if_le.c
-#device        le: ether, ifnet, isadma
-#attach        le at isa with le_isa
-#file  dev/isa/if_le.c                 le
+# device declaration in sys/conf/files
+attach le at isa with le_isa: isadma
+file   dev/isa/if_le_isa.c             le_isa
 
 #
 # ISA Sound hardware

diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index f77d9dd..05ffa12 100644 (file)
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,5 +1,5 @@
-#      $OpenBSD: files.pci,v 1.5 1996/05/02 13:38:15 deraadt Exp $
-#      $NetBSD: files.pci,v 1.14 1996/04/25 02:17:05 thorpej Exp $
+#      $OpenBSD: files.pci,v 1.6 1996/05/10 12:33:25 deraadt Exp $
+#      $NetBSD: files.pci,v 1.15 1996/05/07 02:03:07 thorpej Exp $
 #
 # Config.new file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -39,3 +39,8 @@ file  dev/pci/ppb.c                   ppb
 # device declaration in sys/conf/files
 attach ep at pci with ep_pci
 file   dev/pci/if_ep_pci.c             ep_pci
+
+# AMD am7990 (LANCE) -based Ethernet controllers
+# device declaration in sys/conf/files
+attach le at pci with le_pci
+file   dev/pci/if_le_pci.c             le_pci

diff --git a/sys/dev/tc/files.tc b/sys/dev/tc/files.tc
index 053a846..2cc7de0 100644 (file)
--- a/sys/dev/tc/files.tc
+++ b/sys/dev/tc/files.tc
@@ -1,5 +1,5 @@
-#      $OpenBSD: files.tc,v 1.3 1996/04/21 22:26:22 deraadt Exp $
-#      $NetBSD: files.tc,v 1.3 1996/03/17 00:58:33 thorpej Exp $
+#      $OpenBSD: files.tc,v 1.4 1996/05/10 12:33:25 deraadt Exp $
+#      $NetBSD: files.tc,v 1.4 1996/05/07 02:25:00 thorpej Exp $
 #
 # Config.new file and device description for machine-independent
 # TurboChannel code.  Included by ports that need it.
@@ -8,7 +8,9 @@ device  tc {[slot = -1], [offset = -1]}
 attach tc at tcbus
 file   dev/tc/tc.c                     tc      needs-flag
 
-# XXX conflicts with ISA if_le.c
-#device le: ether, ifnet               # XXX PMAX BASEBOARD OPTIONS
-#attach le at ioasic, tc with le_tc
-#file  dev/tc/if_le.c                  le      needs-flag      # for le_iomem
+# device defined in sys/conf/files
+# attach le at ioasic with le_ioasic
+# attach le at tc with le_tc
+# file dev/tc/if_le_dec.c              (le_ioasic | le_tc)
+# file dev/tc/if_le_ioasic.c           le_ioasic needs-flag # for le_iomem
+# file dev/tc/if_le_tc.c               le_tc