This commit adds driver support for the Silicon Integrated Systems

SiS 900 and SiS 7016 PCI fast ethernet chipsets. Full manuals for the
SiS chips can be found at www.sis.com.tw.

This is a fairly simple chipset. The receiver uses a 128-bit multicast
hash table and single perfect entry for the station address. Transmit and
receive DMA and FIFO thresholds are easily tuneable. Documentation is
pretty decent and performance is not bad, even on my crufty 486. This
driver uses newbus and miibus and is supported on both the i386 and
alpha architectures.

4 files changed, 15 insertions, 1 deletions

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index cb71ebb..c07286a 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -167,6 +167,7 @@ device		mx0		# Macronix 98713/98715/98725 (``PMAC'')
 device		pn0		# Lite-On 82c168/82c169 (``PNIC'')
 device		rl0		# RealTek 8129/8139
 device		sf0		# Adaptec AIC-6915 (``Starfire'')
+device		sis0		# Silicon Integrated Systems SiS 900/SiS 7016
 device		ste0		# Sundance ST201 (D-Link DFE-550TX)
 device		tl0		# Texas Instruments ThunderLAN
 device		tx0		# SMC 9432TX (83c170 ``EPIC'')
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 779f57f..05298f4 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -1571,6 +1571,10 @@ controller	miibus0
 # Technologies ST201 PCI fast ethernet controller. This includes the
 # D-Link DFE-550TX.
 #
+# The 'sis' device provides support for adapters based on the Silicon
+# Integrated Systems SiS 900 and SiS 7016 PCI fast ethernet controller
+# chips.
+#
 # The 'sk' device provides support for the SysKonnect SK-984x series
 # PCI gigabit ethernet NICs. This includes the SK-9841 and SK-9842
 # single port cards (single mode and multimode fiber) and the
@@ -1722,7 +1726,9 @@ device		mx0
 device		pn0
 device		rl0
 device		sf0
+device		sis0
 device		sk0
+device		ste0
 device		ti0
 device		tl0
 device		tx0
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 779f57f..05298f4 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1571,6 +1571,10 @@ controller	miibus0
 # Technologies ST201 PCI fast ethernet controller. This includes the
 # D-Link DFE-550TX.
 #
+# The 'sis' device provides support for adapters based on the Silicon
+# Integrated Systems SiS 900 and SiS 7016 PCI fast ethernet controller
+# chips.
+#
 # The 'sk' device provides support for the SysKonnect SK-984x series
 # PCI gigabit ethernet NICs. This includes the SK-9841 and SK-9842
 # single port cards (single mode and multimode fiber) and the
@@ -1722,7 +1726,9 @@ device		mx0
 device		pn0
 device		rl0
 device		sf0
+device		sis0
 device		sk0
+device		ste0
 device		ti0
 device		tl0
 device		tx0
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 7ca8b25..14bbdd5 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -391,8 +391,9 @@ static DEV_INFO device_info[] = {
 {"le",          "DEC Etherworks 2 and 3 Ethernet adapters",	0,	CLS_NETWORK},
 {"lnc",         "Isolan, Novell NE2100/NE32-VL Ethernet adapters",	0,CLS_NETWORK},
 {"sf",          "Adaptec AIC-6915 PCI Ethernet adapters",		0,CLS_NETWORK},
-{"ste",         "Sundance ST201 PCI Ethernet adapters",			0,CLS_NETWORK},
+{"sis",         "Sis 900/SiS 7016 Ethernet adapters",			0,CLS_NETWORK},
 {"sk",          "SysKonnect SK-984x gigabit Ethernet adapters",		0,CLS_NETWORK},
+{"ste",         "Sundance ST201 PCI Ethernet adapters",			0,CLS_NETWORK},
 {"ti",          "Alteon Networks Tigon gigabit Ethernet adapters",	0,CLS_NETWORK},
 {"tl",          "Texas Instruments ThunderLAN Ethernet adapters",	0,CLS_NETWORK},
 {"tx",          "SMC 9432TX Ethernet adapters",			0,	CLS_NETWORK},