support 905B-FX cards

3 files changed, 16 insertions, 10 deletions

diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index 6c0b70feed8..6418cb0e792 100644
--- a/share/man/man4/xl.4
+++ b/share/man/man4/xl.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xl.4,v 1.3 1998/09/27 20:47:13 deraadt Exp $
+.\"	$OpenBSD: xl.4,v 1.4 1998/10/09 00:15:35 deraadt Exp $
 .\"
 .\" Copyright (c) 1997, 1998
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -48,10 +48,10 @@ driver provides support for PCI ethernet adapters and embedded
 controllers based on the 3Com "boomerang" and "cyclone" bus-master
 Etherlink XL chips.
 This includes the 3c900-TP, 3c900-COMBO, 3c900B-TP, 3c900B-COMBO,
-3c905-TX, 3c905-T4, 3c905B-TP, 3c905B-T4 and 3c905B-TX, and embedded
-3c905-TX and 3c905B-TX ethernet hardware in certain Dell Optiplex and
-Dell Precision desktop machines, and certain Dell Latitude laptop
-docking stations.
+3c905-TX, 3c905-T4, 3c905B-TP, 3c905B-FX, 3c905B-T4, 3c905B-TX.
+Also supported are embedded 3c905-TX and 3c905B-TX ethernet hardware
+in certain Dell Optiplex and Dell Precision desktop machines and
+certain Dell Latitude laptop docking stations.
 .Pp
 Other models of 3Com hardware are supported by the
 .Xr ep 4 ,
@@ -69,7 +69,8 @@ the MII for compatibility with previous drivers. Fast Etherlink XL
 adapters such as the 3c905-TX and 3c905B-TX are capable of 10 or
 100Mbps data rates in either full or half duplex and can be manually
 configured for any supported mode or automatically negotiate the highest
-possible mode with a link partner.
+possible mode with a link partner.  The 3c905B-FX and other similar cards
+are capable of 100 Mbps over fiber.
 .Pp
 The
 .Nm
@@ -98,6 +99,8 @@ option can abso be used to select either
 .Ar full-duplex
 or
 .Ar half-duplex modes.
+.It 100baseFX
+For those cards that support it, set 100 Mbps operation over fiber.
 .It 10base5/AUI
 Enable AUI transceiver (available only on COMBO cards).
 .It 10base2/BNC
diff --git a/sys/dev/pci/if_xl.c b/sys/dev/pci/if_xl.c
index e0231c4cee5..fa877078fa3 100644
--- a/sys/dev/pci/if_xl.c
+++ b/sys/dev/pci/if_xl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xl.c,v 1.11 1998/09/29 02:14:29 jason Exp $	*/
+/*	$OpenBSD: if_xl.c,v 1.12 1998/10/09 00:15:35 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -48,8 +48,9 @@
  * 3Com 3c900B-TPO	10Mbps/RJ-45
  * 3Com 3c900B-COMBO	10Mbps/RJ-45,AUI,BNC
  * 3Com 3c905B-TX	10/100Mbps/RJ-45
- * 3Com 3c905B-FL/FX	10/100Mbps/Fiber-optic
+ * 3Com 3c900-FL	10Mbps FL Fiber-optic
  * 3Com 3c980-TX	10/100Mbps server adapter
+ * 3Com 3c905B-FX	100Mbs FX Fiber-optic
  * Dell Optiplex GX1 on-board 3c918 10/100Mbps/RJ-45
  * Dell Precision on-board 3c905B 10/100Mbps/RJ-45
  * Dell Latitude laptop docking station embedded 3c905-TX
@@ -2940,6 +2941,7 @@ xl_probe(parent, match, aux)
 	case PCI_PRODUCT_3COM_3C905BTX:
 	case PCI_PRODUCT_3COM_3C905BT4:
 	case PCI_PRODUCT_3COM_3C980TX:
+	case PCI_PRODUCT_3COM_3C905BFX:
 		return (1);
 	}
 					
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 6754c877f82..37d60fe7a64 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.91 1998/10/06 07:06:59 downsj Exp $
+$OpenBSD: pcidevs,v 1.92 1998/10/09 00:15:34 deraadt Exp $
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -539,7 +539,8 @@ product	3COM 3C905TX		0x9050	3c905 100Base-TX
 product	3COM 3C905T4		0x9051	3c905 100Base-T4
 product	3COM 3C905BTX		0x9055	3c905B 100Base-TX
 product	3COM 3C905BT4		0x9056	3c905B 100Base-T4
-product 3COM 3C980TX		0x9800	3c980 100Base-TX
+product	3COM 3C905BFX		0x905a	3c905B 100Base-FX
+product	3COM 3C980TX		0x9800	3c980 100Base-TX
 
 /* 3DFX Interactive */
 product 3DFX VOODOO		0x0001	Voodoo