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.

20 files changed, 2232 insertions, 5 deletions

diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c
index f0df3a2..878e4e8 100644
--- a/release/sysinstall/devices.c
+++ b/release/sysinstall/devices.c
@@ -103,6 +103,7 @@ static struct _devname {
     { DEVICE_TYPE_NETWORK,	"pn",		"Lite-On 82168/82169 PNIC PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"rl",		"RealTek 8129/8139 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"sf",		"Adaptec AIC-6915 PCI ethernet card"		},
+    { DEVICE_TYPE_NETWORK,	"sis",		"SiS 900/SiS 7016 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"ste",		"Sundance ST201 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"sk",		"SysKonnect PCI gigabit ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"tx",		"SMC 9432TX ethernet card"					},
diff --git a/release/texts/i386/HARDWARE.TXT b/release/texts/i386/HARDWARE.TXT
index ab863be..5911f7a 100644
--- a/release/texts/i386/HARDWARE.TXT
+++ b/release/texts/i386/HARDWARE.TXT
@@ -110,6 +110,7 @@ mx0     dyn     dyn     n/a     dyn     Macronix 98713/15/25 PCI based cards
 pn0     dyn     dyn     n/a     dyn     Lite-On PNIC PCI based cards
 rl0     dyn     dyn     n/a     dyn     RealTek 8129/8139 fast ethernet
 sf0     dyn     dyn     n/a     dyn     Adaptec AIC-6915 fast ethernet
+sis0    dyn     dyn     n/a     dyn     SiS 900/SiS 7016 fast ethernet
 ste0    dyn     dyn     n/a     dyn     Sundance ST201 fast ethernet
 tl0     dyn     dyn     n/a     dyn     TI TNET100 'ThunderLAN' cards.
 wb0     dyn     dyn     n/a     dyn     Winbond W89C840F PCI based cards.
@@ -482,6 +483,8 @@ NICs including the following:
   Hawking Technologies PN102TX
   D-Link DFE-530TX
 
+Silicon Integrated Systems SiS 900 and SiS 7016 PCI fast ethernet NICs
+
 Sundance Technologies ST201 PCI fast ethernet NICs including
 the following:
   D-Link DFE-550TX
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index 68c9af3..1f5b82b 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -95,6 +95,9 @@ given rule can be given an arbitrary logging limit. [MERGED]
 The top-level category "security" has been added, and IPFW now uses
 syslog(3) to log all messages to /var/log/security.
 
+Driver support has been added for PCI fast ethernet adapters based on
+the Silicon Integrated Systems SiS 900 and SiS 7016 ethernet controllers.
+
 1.2. SECURITY FIXES
 -------------------
 
@@ -300,6 +303,8 @@ NICs including the following:
   Hawking Technologies PN102TX
   D-Link DFE-530TX
 
+Silicon Integrated Systems SiS 900 and SiS 7016 PCI fast ethernet NICs
+
 Sundance Technologies ST201 PCI fast ethernet NICs including
 the following:
   D-Link DFE-550TX
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index e8bd80a..e05baf4 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -6,7 +6,7 @@ MAN4=	adv.4 adw.4 aha.4 ahb.4 ahc.4 aic.4 al.4 alpm.4 apm.4 ar.4 asc.4 \
 	io.4 joy.4 keyboard.4 labpc.4 le.4 lnc.4 matcd.4 mcd.4 \
 	mem.4 meteor.4 mouse.4 mse.4 mtio.4 mx.4 ncr.4 npx.4 \
 	ohci.4 pcf.4 pcm.4 pcvt.4 perfmon.4 pn.4 pnp.4 ppc.4 psm.4 \
-	rdp.4 rl.4 sb.4 scd.4 screen.4 sf.4 si.4 sio.4 sk.4 \
+	rdp.4 rl.4 sb.4 scd.4 screen.4 sf.4 si.4 sio.4 sis.4 sk.4 \
 	spkr.4 splash.4 sr.4 ste.4 syscons.4 sysmouse.4 ti.4 tl.4 tw.4 \
 	tx.4 uhci.4 ukbd.4 umass.4 ums.4 usb.4 vga.4 vr.4 vx.4 \
 	wb.4 wd.4 wfd.4 wi.4 wl.4 wt.4 xl.4 ze.4 zp.4
@@ -76,6 +76,7 @@ MLINKS+=	screen.4 ../screen.4
 MLINKS+=	sf.4 ../sf.4
 MLINKS+=	si.4 ../si.4
 MLINKS+=	sio.4 ../sio.4
+MLINKS+=	sis.4 ../sis.4
 MLINKS+=	sk.4 ../sk.4
 MLINKS+=	spkr.4 ../spkr.4 spkr.4 speaker.4 spkr.4 ../speaker.4
 MLINKS+=	splash.4 ../splash.4 \
diff --git a/share/man/man4/man4.i386/sis.4 b/share/man/man4/man4.i386/sis.4
new file mode 100644
index 0000000..47a2579
--- /dev/null
+++ b/share/man/man4/man4.i386/sis.4
@@ -0,0 +1,149 @@
+.\" Copyright (c) 1997, 1998, 1999
+.\"	Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by Bill Paul.
+.\" 4. Neither the name of the author nor the names of any co-contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"   without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+.\" THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 4, 1999
+.Dt SIS 4 i386
+.Os FreeBSD
+.Sh NAME
+.Nm sis
+.Nd
+Silicon Integrated Systems fast ethernet device driver
+.Sh SYNOPSIS
+.Cd "controller miibus0"
+.Cd "device sis0"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for PCI ethernet adapters and embedded
+controllers based on the Silicon Integrated Systems SiS 900
+and SiS 7016 fast ethernet controller chips.
+.Pp
+The SiS 900 is a 100Mbps ethernet MAC and MII-compliant transceiver
+in a single package. It uses a bus master DMA and a scatter/gather
+descriptor scheme. The SiS 7016 is similar to the SiS 900 except
+that it has no internal PHY, requiring instead an external transceiver
+to be attached to its MII interface.
+The SiS 900 and SiS 7016 both have a 128-bit multicast hash filter
+and a single perfect filter entry for the station address.
+.Pp
+The
+.Nm
+driver supports the following media types:
+.Pp
+.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.It autoselect
+Enable autoselection of the media type and options.
+The user can manually override
+the autoselected mode by adding media options to the
+.Pa /etc/rc.conf
+fine.
+.It 10baseT/UTP
+Set 10Mbps operation. The
+.Ar mediaopt
+option can also be used to select either
+.Ar full-duplex
+or
+.Ar half-duplex modes.
+.It 100baseTX
+Set 100Mbps (fast ethernet) operation. The
+.Ar mediaopt
+option can also be used to select either
+.Ar full-duplex
+or
+.Ar half-duplex
+modes.
+.El
+.Pp
+The
+.Nm
+driver supports the following media options:
+.Pp
+.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.It full-duplex
+Force full duplex operation
+.It half-duplex
+Force half duplex operation.
+.El
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+.Sh DIAGNOSTICS
+.Bl -diag
+.It "sis%d: couldn't map ports/memory"
+A fatal initialization error has occurred.
+.It "sis%d: couldn't map interrupt"
+A fatal initialization error has occurred.
+.It "sis%d: watchdog timeout"
+The device has stopped responding to the network, or there is a problem with
+the network connection (cable).
+.It "sis%d: no memory for rx list"
+The driver failed to allocate an mbuf for the receiver ring.
+.It "sis%d: no memory for tx list"
+The driver failed to allocate an mbuf for the transmitter ring when
+allocating a pad buffer or collapsing an mbuf chain into a clusisr.
+.It "sis%d: chip is in D3 power state -- setting to D0"
+This message applies only to adapters which support power
+management. Some operating sysisms place the controller in low power
+mode when shutting down, and some PCI BIOSes fail to bring the chip
+out of this state before configuring it. The controller loses all of
+its PCI configuration in the D3 state, so if the BIOS does not set
+it back to full power mode in time, it won't be able to configure it
+correctly. The driver tries to detect this condition and bring
+the adapter back to the D0 (full power) state, but this may not be
+enough to return the driver to a fully operational condition. If
+you see this message at boot time and the driver fails to attach
+the device as a network interface, you will have to perform second
+warm boot to have the device properly configured.
+.Pp
+Note that this condition only occurs when warm booting from another
+operating sysism. If you power down your sysism prior to booting
+.Fx ,
+the card should be configured correctly.
+.El
+.Sh SEE ALSO
+.Xr arp 4 ,
+.Xr netintro 4 , 
+.Xr ifconfig 8
+.Rs
+.%T SiS 900 and SiS 7016 datasheets
+.%O http://www.sis.com.tw
+.Re
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 3.0 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Bill Paul Aq wpaul@ee.columbia.edu .
diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4
new file mode 100644
index 0000000..47a2579
--- /dev/null
+++ b/share/man/man4/sis.4
@@ -0,0 +1,149 @@
+.\" Copyright (c) 1997, 1998, 1999
+.\"	Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by Bill Paul.
+.\" 4. Neither the name of the author nor the names of any co-contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"   without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+.\" THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd September 4, 1999
+.Dt SIS 4 i386
+.Os FreeBSD
+.Sh NAME
+.Nm sis
+.Nd
+Silicon Integrated Systems fast ethernet device driver
+.Sh SYNOPSIS
+.Cd "controller miibus0"
+.Cd "device sis0"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for PCI ethernet adapters and embedded
+controllers based on the Silicon Integrated Systems SiS 900
+and SiS 7016 fast ethernet controller chips.
+.Pp
+The SiS 900 is a 100Mbps ethernet MAC and MII-compliant transceiver
+in a single package. It uses a bus master DMA and a scatter/gather
+descriptor scheme. The SiS 7016 is similar to the SiS 900 except
+that it has no internal PHY, requiring instead an external transceiver
+to be attached to its MII interface.
+The SiS 900 and SiS 7016 both have a 128-bit multicast hash filter
+and a single perfect filter entry for the station address.
+.Pp
+The
+.Nm
+driver supports the following media types:
+.Pp
+.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.It autoselect
+Enable autoselection of the media type and options.
+The user can manually override
+the autoselected mode by adding media options to the
+.Pa /etc/rc.conf
+fine.
+.It 10baseT/UTP
+Set 10Mbps operation. The
+.Ar mediaopt
+option can also be used to select either
+.Ar full-duplex
+or
+.Ar half-duplex modes.
+.It 100baseTX
+Set 100Mbps (fast ethernet) operation. The
+.Ar mediaopt
+option can also be used to select either
+.Ar full-duplex
+or
+.Ar half-duplex
+modes.
+.El
+.Pp
+The
+.Nm
+driver supports the following media options:
+.Pp
+.Bl -tag -width xxxxxxxxxxxxxxxxxxxx
+.It full-duplex
+Force full duplex operation
+.It half-duplex
+Force half duplex operation.
+.El
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+.Sh DIAGNOSTICS
+.Bl -diag
+.It "sis%d: couldn't map ports/memory"
+A fatal initialization error has occurred.
+.It "sis%d: couldn't map interrupt"
+A fatal initialization error has occurred.
+.It "sis%d: watchdog timeout"
+The device has stopped responding to the network, or there is a problem with
+the network connection (cable).
+.It "sis%d: no memory for rx list"
+The driver failed to allocate an mbuf for the receiver ring.
+.It "sis%d: no memory for tx list"
+The driver failed to allocate an mbuf for the transmitter ring when
+allocating a pad buffer or collapsing an mbuf chain into a clusisr.
+.It "sis%d: chip is in D3 power state -- setting to D0"
+This message applies only to adapters which support power
+management. Some operating sysisms place the controller in low power
+mode when shutting down, and some PCI BIOSes fail to bring the chip
+out of this state before configuring it. The controller loses all of
+its PCI configuration in the D3 state, so if the BIOS does not set
+it back to full power mode in time, it won't be able to configure it
+correctly. The driver tries to detect this condition and bring
+the adapter back to the D0 (full power) state, but this may not be
+enough to return the driver to a fully operational condition. If
+you see this message at boot time and the driver fails to attach
+the device as a network interface, you will have to perform second
+warm boot to have the device properly configured.
+.Pp
+Note that this condition only occurs when warm booting from another
+operating sysism. If you power down your sysism prior to booting
+.Fx ,
+the card should be configured correctly.
+.El
+.Sh SEE ALSO
+.Xr arp 4 ,
+.Xr netintro 4 , 
+.Xr ifconfig 8
+.Rs
+.%T SiS 900 and SiS 7016 datasheets
+.%O http://www.sis.com.tw
+.Re
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 3.0 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Bill Paul Aq wpaul@ee.columbia.edu .
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 6a30b4f..daa3307 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -120,8 +120,9 @@ device le0
 device mx0
 device pn0
 device rl0
-device ste0
 device sf0
+device sis0
+device ste0
 device tl0
 device vr0
 device wb0
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 6a30b4f..daa3307 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -120,8 +120,9 @@ device le0
 device mx0
 device pn0
 device rl0
-device ste0
 device sf0
+device sis0
+device ste0
 device tl0
 device vr0
 device wb0
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index cb71ebb..c07286a 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/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/conf/NOTES b/sys/conf/NOTES
index 779f57f..05298f4 100644
--- a/sys/conf/NOTES
+++ b/sys/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/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},
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 2f28cb7..28cdb34 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -4,7 +4,7 @@
 
 SUBDIR=	ax ccd cd9660 coda fdesc fxp if_disc if_ppp if_sl if_tun ipfw \
 	kernfs mfs mii msdos mx nfs ntfs nullfs pn portal procfs sf \
-	sk ste ti tl umapfs union vn vr wb xl
+	sis sk ste ti tl umapfs union vn vr wb xl
 
 # XXX some of these can move to the general case when de-i386'ed
 .if ${MACHINE_ARCH} == "i386"
diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile
new file mode 100644
index 0000000..50d8c3f
--- /dev/null
+++ b/sys/modules/sis/Makefile
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+S	= ${.CURDIR}/../..
+.PATH:	$S/pci
+KMOD	= sis
+SRCS	= if_sis.c sis.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	+= miibus_if.h
+CLEANFILES	+= sis.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= miibus_if.h
+CFLAGS	+= ${DEBUG_FLAGS}
+
+sis.h:
+	echo "#define NSIS 1" > sis.h
+
+bpf.h:
+	echo "#define NBPF 1" > bpf.h
+
+opt_bdg.h:
+	touch opt_bdg.h
+
+device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/device_if.m
+
+bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
+
+pci_if.h: $S/kern/makedevops.pl $S/pci/pci_if.m
+	perl $S/kern/makedevops.pl -h $S/pci/pci_if.m
+
+miibus_if.h: $S/kern/makedevops.pl $S/dev/mii/miibus_if.m
+	perl $S/kern/makedevops.pl -h $S/dev/mii/miibus_if.m
+
+.include <bsd.kmod.mk>
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
new file mode 100644
index 0000000..aea1095
--- /dev/null
+++ b/sys/pci/if_sis.c
@@ -0,0 +1,1457 @@
+/*
+ * Copyright (c) 1997, 1998, 1999
+ *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Bill Paul.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are
+ * available from http://www.sis.com.tw.
+ *
+ * Written by Bill Paul <wpaul@ee.columbia.edu>
+ * Electrical Engineering Department
+ * Columbia University, New York City
+ */
+
+/*
+ * The SiS 900 is a fairly simple chip. It uses bus master DMA with
+ * simple TX and RX descriptors of 3 longwords in size. The receiver
+ * has a single perfect filter entry for the station address and a
+ * 128-bit multicast hash table. The SiS 900 has a built-in MII-based
+ * transceiver while the 7016 requires an external transceiver chip.
+ * Both chips offer the standard bit-bang MII interface as well as
+ * an enchanced PHY interface which simplifies accessing MII registers.
+ *
+ * The only downside to this chipset is that RX descriptors must be
+ * longword aligned.
+ */
+
+#include "bpf.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/sockio.h>
+#include <sys/mbuf.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+
+#if NBPF > 0
+#include <net/bpf.h>
+#endif
+
+#include <vm/vm.h>              /* for vtophys */
+#include <vm/pmap.h>            /* for vtophys */
+#include <machine/clock.h>      /* for DELAY */
+#include <machine/bus_pio.h>
+#include <machine/bus_memio.h>
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+
+#include <pci/pcireg.h>
+#include <pci/pcivar.h>
+
+#define SIS_USEIOSPACE
+
+#include <pci/if_sisreg.h>
+
+#include "miibus_if.h"
+
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif
+
+/*
+ * Various supported device vendors/types and their names.
+ */
+static struct sis_type sis_devs[] = {
+	{ SIS_VENDORID, SIS_DEVICEID_900, "SiS 900 10/100BaseTX" },
+	{ SIS_VENDORID, SIS_DEVICEID_7016, "SiS 7016 10/100BaseTX" },
+	{ 0, 0, NULL }
+};
+
+static int sis_probe		__P((device_t));
+static int sis_attach		__P((device_t));
+static int sis_detach		__P((device_t));
+
+static int sis_newbuf		__P((struct sis_softc *,
+					struct sis_desc *,
+					struct mbuf *));
+static int sis_encap		__P((struct sis_softc *,
+					struct mbuf *, u_int32_t *));
+static void sis_rxeof		__P((struct sis_softc *));
+static void sis_rxeoc		__P((struct sis_softc *));
+static void sis_txeof		__P((struct sis_softc *));
+static void sis_intr		__P((void *));
+static void sis_tick		__P((void *));
+static void sis_start		__P((struct ifnet *));
+static int sis_ioctl		__P((struct ifnet *, u_long, caddr_t));
+static void sis_init		__P((void *));
+static void sis_stop		__P((struct sis_softc *));
+static void sis_watchdog		__P((struct ifnet *));
+static void sis_shutdown		__P((device_t));
+static int sis_ifmedia_upd	__P((struct ifnet *));
+static void sis_ifmedia_sts	__P((struct ifnet *, struct ifmediareq *));
+
+static void sis_delay		__P((struct sis_softc *));
+static void sis_eeprom_idle	__P((struct sis_softc *));
+static void sis_eeprom_putbyte	__P((struct sis_softc *, int));
+static void sis_eeprom_getword	__P((struct sis_softc *, int, u_int16_t *));
+static void sis_read_eeprom	__P((struct sis_softc *, caddr_t, int,
+							int, int));
+static int sis_miibus_readreg	__P((device_t, int, int));
+static int sis_miibus_writereg	__P((device_t, int, int, int));
+static void sis_miibus_statchg	__P((device_t));
+
+static void sis_setmulti	__P((struct sis_softc *));
+static u_int32_t sis_calchash	__P((caddr_t));
+static void sis_reset		__P((struct sis_softc *));
+static int sis_list_rx_init	__P((struct sis_softc *));
+static int sis_list_tx_init	__P((struct sis_softc *));
+
+#ifdef SIS_USEIOSPACE
+#define SIS_RES			SYS_RES_IOPORT
+#define SIS_RID			SIS_PCI_LOIO
+#else
+#define SIS_RES			SYS_RES_IOPORT
+#define SIS_RID			SIS_PCI_LOIO
+#endif
+
+static device_method_t sis_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		sis_probe),
+	DEVMETHOD(device_attach,	sis_attach),
+	DEVMETHOD(device_detach,	sis_detach),
+	DEVMETHOD(device_shutdown,	sis_shutdown),
+
+	/* bus interface */
+	DEVMETHOD(bus_print_child,	bus_generic_print_child),
+	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
+
+	/* MII interface */
+	DEVMETHOD(miibus_readreg,	sis_miibus_readreg),
+	DEVMETHOD(miibus_writereg,	sis_miibus_writereg),
+	DEVMETHOD(miibus_statchg,	sis_miibus_statchg),
+
+	{ 0, 0 }
+};
+
+static driver_t sis_driver = {
+	"sis",
+	sis_methods,
+	sizeof(struct sis_softc)
+};
+
+static devclass_t sis_devclass;
+
+DRIVER_MODULE(sis, pci, sis_driver, sis_devclass, 0, 0);
+DRIVER_MODULE(miibus, sis, miibus_driver, miibus_devclass, 0, 0);
+
+#define SIS_SETBIT(sc, reg, x)				\
+	CSR_WRITE_4(sc, reg,				\
+		CSR_READ_4(sc, reg) | (x))
+
+#define SIS_CLRBIT(sc, reg, x)				\
+	CSR_WRITE_4(sc, reg,				\
+		CSR_READ_4(sc, reg) & ~(x))
+
+#define SIO_SET(x)					\
+	CSR_WRITE_4(sc, SIS_EECTL, CSR_READ_4(sc, SIS_EECTL) | x)
+
+#define SIO_CLR(x)					\
+	CSR_WRITE_4(sc, SIS_EECTL, CSR_READ_4(sc, SIS_EECTL) & ~x)
+
+static void sis_delay(sc)
+	struct sis_softc	*sc;
+{
+	int			idx;
+
+	for (idx = (300 / 33) + 1; idx > 0; idx--)
+		CSR_READ_4(sc, SIS_CSR);
+
+	return;
+}
+
+static void sis_eeprom_idle(sc)
+	struct sis_softc	*sc;
+{
+	register int		i;
+
+	SIO_SET(SIS_EECTL_CSEL);
+	sis_delay(sc);
+	SIO_SET(SIS_EECTL_CLK);
+	sis_delay(sc);
+
+	for (i = 0; i < 25; i++) {
+		SIO_CLR(SIS_EECTL_CLK);
+		sis_delay(sc);
+		SIO_SET(SIS_EECTL_CLK);
+		sis_delay(sc);
+	}
+
+	SIO_CLR(SIS_EECTL_CLK);
+	sis_delay(sc);
+	SIO_CLR(SIS_EECTL_CSEL);
+	sis_delay(sc);
+	CSR_WRITE_4(sc, SIS_EECTL, 0x00000000);
+
+	return;
+}
+
+/*
+ * Send a read command and address to the EEPROM, check for ACK.
+ */
+static void sis_eeprom_putbyte(sc, addr)
+	struct sis_softc	*sc;
+	int			addr;
+{
+	register int		d, i;
+
+	d = addr | SIS_EECMD_READ;
+
+	/*
+	 * Feed in each bit and stobe the clock.
+	 */
+	for (i = 0x400; i; i >>= 1) {
+		if (d & i) {
+			SIO_SET(SIS_EECTL_DIN);
+		} else {
+			SIO_CLR(SIS_EECTL_DIN);
+		}
+		sis_delay(sc);
+		SIO_SET(SIS_EECTL_CLK);
+		sis_delay(sc);
+		SIO_CLR(SIS_EECTL_CLK);
+		sis_delay(sc);
+	}
+
+	return;
+}
+
+/*
+ * Read a word of data stored in the EEPROM at address 'addr.'
+ */
+static void sis_eeprom_getword(sc, addr, dest)
+	struct sis_softc	*sc;
+	int			addr;
+	u_int16_t		*dest;
+{
+	register int		i;
+	u_int16_t		word = 0;
+
+	/* Force EEPROM to idle state. */
+	sis_eeprom_idle(sc);
+
+	/* Enter EEPROM access mode. */
+	sis_delay(sc);
+	SIO_SET(SIS_EECTL_CSEL);
+	sis_delay(sc);
+	SIO_SET(SIS_EECTL_CLK);
+	sis_delay(sc);
+
+	/*
+	 * Send address of word we want to read.
+	 */
+	sis_eeprom_putbyte(sc, addr);
+
+	/*
+	 * Start reading bits from EEPROM.
+	 */
+	for (i = 0x8000; i; i >>= 1) {
+		SIO_SET(SIS_EECTL_CLK);
+		sis_delay(sc);
+		if (CSR_READ_4(sc, SIS_EECTL) & SIS_EECTL_DOUT)
+			word |= i;
+		sis_delay(sc);
+		SIO_CLR(SIS_EECTL_CLK);
+		sis_delay(sc);
+	}
+
+	/* Turn off EEPROM access mode. */
+	sis_eeprom_idle(sc);
+
+	*dest = word;
+
+	return;
+}
+
+/*
+ * Read a sequence of words from the EEPROM.
+ */
+static void sis_read_eeprom(sc, dest, off, cnt, swap)
+	struct sis_softc	*sc;
+	caddr_t			dest;
+	int			off;
+	int			cnt;
+	int			swap;
+{
+	int			i;
+	u_int16_t		word = 0, *ptr;
+
+	for (i = 0; i < cnt; i++) {
+		sis_eeprom_getword(sc, off + i, &word);
+		ptr = (u_int16_t *)(dest + (i * 2));
+		if (swap)
+			*ptr = ntohs(word);
+		else
+			*ptr = word;
+	}
+
+	return;
+}
+
+static int sis_miibus_readreg(dev, phy, reg)
+	device_t		dev;
+	int			phy, reg;
+{
+	struct sis_softc	*sc;
+	int			i, val;
+
+	sc = device_get_softc(dev);
+
+	if (sc->sis_type == SIS_TYPE_900 && phy != 0)
+		return(0);
+
+	CSR_WRITE_4(sc, SIS_PHYCTL, (phy << 11) | (reg << 6) | SIS_PHYOP_READ);
+	SIS_SETBIT(sc, SIS_PHYCTL, SIS_PHYCTL_ACCESS);
+
+	for (i = 0; i < SIS_TIMEOUT; i++) {
+		if (!(CSR_READ_4(sc, SIS_PHYCTL) & SIS_PHYCTL_ACCESS))
+			break;
+	}
+
+	if (i == SIS_TIMEOUT) {
+		printf("sis%d: PHY failed to come ready\n", sc->sis_unit);
+		return(0);
+	}
+
+	val = (CSR_READ_4(sc, SIS_PHYCTL) >> 16) & 0xFFFF;
+
+	if (val == 0xFFFF)
+		return(0);
+
+	return(val);
+}
+
+static int sis_miibus_writereg(dev, phy, reg, data)
+	device_t		dev;
+	int			phy, reg, data;
+{
+	struct sis_softc	*sc;
+	int			i;
+
+	sc = device_get_softc(dev);
+
+	if (sc->sis_type == SIS_TYPE_900 && phy != 0)
+		return(0);
+
+	CSR_WRITE_4(sc, SIS_PHYCTL, (data << 16) | (phy << 11) |
+	    (reg << 6) | SIS_PHYOP_WRITE);
+	SIS_SETBIT(sc, SIS_PHYCTL, SIS_PHYCTL_ACCESS);
+
+	for (i = 0; i < SIS_TIMEOUT; i++) {
+		if (!(CSR_READ_4(sc, SIS_PHYCTL) & SIS_PHYCTL_ACCESS))
+			break;
+	}
+
+	if (i == SIS_TIMEOUT)
+		printf("sis%d: PHY failed to come ready\n", sc->sis_unit);
+
+	return(0);
+}
+
+static void sis_miibus_statchg(dev)
+	device_t		dev;
+{
+	struct sis_softc	*sc;
+	struct mii_data		*mii;
+
+	sc = device_get_softc(dev);
+	mii = device_get_softc(sc->sis_miibus);
+
+	if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX) {
+		SIS_SETBIT(sc, SIS_TX_CFG,
+		    (SIS_TXCFG_IGN_HBEAT|SIS_TXCFG_IGN_CARR));
+		SIS_SETBIT(sc, SIS_RX_CFG, SIS_RXCFG_RX_TXPKTS);
+	} else {
+		SIS_CLRBIT(sc, SIS_TX_CFG,
+		    (SIS_TXCFG_IGN_HBEAT|SIS_TXCFG_IGN_CARR));
+		SIS_CLRBIT(sc, SIS_RX_CFG, SIS_RXCFG_RX_TXPKTS);
+	}
+
+	return;
+}
+
+static u_int32_t sis_calchash(addr)
+	caddr_t			addr;
+{
+	u_int32_t		crc, carry; 
+	int			i, j;
+	u_int8_t		c;
+
+	/* Compute CRC for the address value. */
+	crc = 0xFFFFFFFF; /* initial value */
+
+	for (i = 0; i < 6; i++) {
+		c = *(addr + i);
+		for (j = 0; j < 8; j++) {
+			carry = ((crc & 0x80000000) ? 1 : 0) ^ (c & 0x01);
+			crc <<= 1;
+			c >>= 1;
+			if (carry)
+				crc = (crc ^ 0x04c11db6) | carry;
+		}
+	}
+
+	/* return the filter bit position */
+	return((crc >> 25) & 0x0000007F);
+}
+
+static void sis_setmulti(sc)
+	struct sis_softc	*sc;
+{
+	struct ifnet		*ifp;
+	struct ifmultiaddr	*ifma;
+	u_int32_t		h = 0, i, filtsave;
+
+	ifp = &sc->arpcom.ac_if;
+
+	if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) {
+		SIS_SETBIT(sc, SIS_RXFILT_CTL, SIS_RXFILTCTL_ALLMULTI);
+		return;
+	}
+
+	SIS_CLRBIT(sc, SIS_RXFILT_CTL, SIS_RXFILTCTL_ALLMULTI);
+
+	filtsave = CSR_READ_4(sc, SIS_RXFILT_CTL);
+
+	/* first, zot all the existing hash bits */
+	for (i = 0; i < 8; i++) {
+		CSR_WRITE_4(sc, SIS_RXFILT_CTL, (4 + ((i * 16) >> 4)) << 16);
+		CSR_WRITE_4(sc, SIS_RXFILT_DATA, 0);
+	}
+
+	/* now program new ones */
+	for (ifma = ifp->if_multiaddrs.lh_first; ifma != NULL;
+	    ifma = ifma->ifma_link.le_next) {
+		if (ifma->ifma_addr->sa_family != AF_LINK)
+			continue;
+		h = sis_calchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
+		CSR_WRITE_4(sc, SIS_RXFILT_CTL, (4 + (h >> 4)) << 16);
+		SIS_SETBIT(sc, SIS_RXFILT_DATA, (1 << (h & 0xF)));
+	}
+
+	CSR_WRITE_4(sc, SIS_RXFILT_CTL, filtsave);
+
+	return;
+}
+
+static void sis_reset(sc)
+	struct sis_softc	*sc;
+{
+	register int		i;
+
+	SIS_SETBIT(sc, SIS_CSR, SIS_CSR_RESET);
+
+	for (i = 0; i < SIS_TIMEOUT; i++) {
+		if (!(CSR_READ_4(sc, SIS_CSR) & SIS_CSR_RESET))
+			break;
+	}
+
+	if (i == SIS_TIMEOUT)
+		printf("sis%d: reset never completed\n", sc->sis_unit);
+
+	/* Wait a little while for the chip to get its brains in order. */
+	DELAY(1000);
+        return;
+}
+
+/*
+ * Probe for an SiS chip. Check the PCI vendor and device
+ * IDs against our list and return a device name if we find a match.
+ */
+static int sis_probe(dev)
+	device_t		dev;
+{
+	struct sis_type		*t;
+
+	t = sis_devs;
+
+	while(t->sis_name != NULL) {
+		if ((pci_get_vendor(dev) == t->sis_vid) &&
+		    (pci_get_device(dev) == t->sis_did)) {
+			device_set_desc(dev, t->sis_name);
+			return(0);
+		}
+		t++;
+	}
+
+	return(ENXIO);
+}
+
+/*
+ * Attach the interface. Allocate softc structures, do ifmedia
+ * setup and ethernet/BPF attach.
+ */
+static int sis_attach(dev)
+	device_t		dev;
+{
+	int			s;
+	u_char			eaddr[ETHER_ADDR_LEN];
+	u_int32_t		command;
+	struct sis_softc	*sc;
+	struct ifnet		*ifp;
+	int			unit, error = 0, rid;
+
+	s = splimp();
+
+	sc = device_get_softc(dev);
+	unit = device_get_unit(dev);
+	bzero(sc, sizeof(struct sis_softc));
+
+	if (pci_get_device(dev) == SIS_DEVICEID_900)
+		sc->sis_type = SIS_TYPE_900;
+	if (pci_get_device(dev) == SIS_DEVICEID_7016)
+		sc->sis_type = SIS_TYPE_7016;
+
+	/*
+	 * Handle power management nonsense.
+	 */
+
+	command = pci_read_config(dev, SIS_PCI_CAPID, 4) & 0x000000FF;
+	if (command == 0x01) {
+
+		command = pci_read_config(dev, SIS_PCI_PWRMGMTCTRL, 4);
+		if (command & SIS_PSTATE_MASK) {
+			u_int32_t		iobase, membase, irq;
+
+			/* Save important PCI config data. */
+			iobase = pci_read_config(dev, SIS_PCI_LOIO, 4);
+			membase = pci_read_config(dev, SIS_PCI_LOMEM, 4);
+			irq = pci_read_config(dev, SIS_PCI_INTLINE, 4);
+
+			/* Reset the power state. */
+			printf("sis%d: chip is in D%d power mode "
+			"-- setting to D0\n", unit, command & SIS_PSTATE_MASK);
+			command &= 0xFFFFFFFC;
+			pci_write_config(dev, SIS_PCI_PWRMGMTCTRL, command, 4);
+
+			/* Restore PCI config data. */
+			pci_write_config(dev, SIS_PCI_LOIO, iobase, 4);
+			pci_write_config(dev, SIS_PCI_LOMEM, membase, 4);
+			pci_write_config(dev, SIS_PCI_INTLINE, irq, 4);
+		}
+	}
+
+	/*
+	 * Map control/status registers.
+	 */
+	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+	command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
+	pci_write_config(dev, PCI_COMMAND_STATUS_REG, command, 4);
+	command = pci_read_config(dev, PCI_COMMAND_STATUS_REG, 4);
+
+#ifdef SIS_USEIOSPACE
+	if (!(command & PCIM_CMD_PORTEN)) {
+		printf("sis%d: failed to enable I/O ports!\n", unit);
+		error = ENXIO;;
+		goto fail;
+	}
+#else
+	if (!(command & PCIM_CMD_MEMEN)) {
+		printf("sis%d: failed to enable memory mapping!\n", unit);
+		error = ENXIO;;
+		goto fail;
+	}
+#endif
+
+	rid = SIS_RID;
+	sc->sis_res = bus_alloc_resource(dev, SIS_RES, &rid,
+	    0, ~0, 1, RF_ACTIVE);
+
+	if (sc->sis_res == NULL) {
+		printf("sis%d: couldn't map ports/memory\n", unit);
+		error = ENXIO;
+		goto fail;
+	}
+
+	sc->sis_btag = rman_get_bustag(sc->sis_res);
+	sc->sis_bhandle = rman_get_bushandle(sc->sis_res);
+
+	/* Allocate interrupt */
+	rid = 0;
+	sc->sis_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	    RF_SHAREABLE | RF_ACTIVE);
+
+	if (sc->sis_irq == NULL) {
+		printf("sis%d: couldn't map interrupt\n", unit);
+		bus_release_resource(dev, SIS_RES, SIS_RID, sc->sis_res);
+		error = ENXIO;
+		goto fail;
+	}
+
+	error = bus_setup_intr(dev, sc->sis_irq, INTR_TYPE_NET,
+	    sis_intr, sc, &sc->sis_intrhand);
+
+	if (error) {
+		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sis_res);
+		bus_release_resource(dev, SIS_RES, SIS_RID, sc->sis_res);
+		printf("sis%d: couldn't set up irq\n", unit);
+		goto fail;
+	}
+
+	/* Reset the adapter. */
+	sis_reset(sc);
+
+	/*
+	 * Get station address from the EEPROM.
+	 */
+	sis_read_eeprom(sc, (caddr_t)&eaddr, SIS_EE_NODEADDR, 3, 0);
+
+	/*
+	 * A SiS chip was detected. Inform the world.
+	 */
+	printf("sis%d: Ethernet address: %6D\n", unit, eaddr, ":");
+
+	sc->sis_unit = unit;
+	callout_handle_init(&sc->sis_stat_ch);
+	bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
+
+	sc->sis_ldata = contigmalloc(sizeof(struct sis_list_data), M_DEVBUF,
+	    M_NOWAIT, 0x100000, 0xffffffff, PAGE_SIZE, 0);
+
+	if (sc->sis_ldata == NULL) {
+		printf("sis%d: no memory for list buffers!\n", unit);
+		bus_teardown_intr(dev, sc->sis_irq, sc->sis_intrhand);
+		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sis_irq);
+		bus_release_resource(dev, SIS_RES, SIS_RID, sc->sis_res);
+		error = ENXIO;
+		goto fail;
+	}
+	bzero(sc->sis_ldata, sizeof(struct sis_list_data));
+
+	ifp = &sc->arpcom.ac_if;
+	ifp->if_softc = sc;
+	ifp->if_unit = unit;
+	ifp->if_name = "sis";
+	ifp->if_mtu = ETHERMTU;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_ioctl = sis_ioctl;
+	ifp->if_output = ether_output;
+	ifp->if_start = sis_start;
+	ifp->if_watchdog = sis_watchdog;
+	ifp->if_init = sis_init;
+	ifp->if_baudrate = 10000000;
+	ifp->if_snd.ifq_maxlen = SIS_TX_LIST_CNT - 1;
+
+	/*
+	 * Do MII setup.
+	 */
+	if (mii_phy_probe(dev, &sc->sis_miibus,
+	    sis_ifmedia_upd, sis_ifmedia_sts)) {
+		printf("sis%d: MII without any PHY!\n", sc->sis_unit);
+		bus_teardown_intr(dev, sc->sis_irq, sc->sis_intrhand);
+		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sis_irq);
+		bus_release_resource(dev, SIS_RES, SIS_RID, sc->sis_res);
+		error = ENXIO;
+		goto fail;
+	}
+
+	/*
+	 * Call MI attach routines.
+	 */
+	if_attach(ifp);
+	ether_ifattach(ifp);
+	callout_handle_init(&sc->sis_stat_ch);
+
+#if NBPF > 0
+	bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
+#endif
+
+fail:
+	splx(s);
+	return(error);
+}
+
+static int sis_detach(dev)
+	device_t		dev;
+{
+	struct sis_softc	*sc;
+	struct ifnet		*ifp;
+	int			s;
+
+	s = splimp();
+
+	sc = device_get_softc(dev);
+	ifp = &sc->arpcom.ac_if;
+
+	sis_reset(sc);
+	sis_stop(sc);
+	if_detach(ifp);
+
+	bus_generic_detach(dev);
+	device_delete_child(dev, sc->sis_miibus);
+
+	bus_teardown_intr(dev, sc->sis_irq, sc->sis_intrhand);
+	bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sis_irq);
+	bus_release_resource(dev, SIS_RES, SIS_RID, sc->sis_res);
+
+	contigfree(sc->sis_ldata, sizeof(struct sis_list_data), M_DEVBUF);
+
+	splx(s);
+
+	return(0);
+}
+
+/*
+ * Initialize the transmit descriptors.
+ */
+static int sis_list_tx_init(sc)
+	struct sis_softc	*sc;
+{
+	struct sis_list_data	*ld;
+	struct sis_ring_data	*cd;
+	int			i;
+
+	cd = &sc->sis_cdata;
+	ld = sc->sis_ldata;
+
+	for (i = 0; i < SIS_TX_LIST_CNT; i++) {
+		if (i == (SIS_TX_LIST_CNT - 1)) {
+			ld->sis_tx_list[i].sis_nextdesc =
+			    &ld->sis_tx_list[0];
+			ld->sis_tx_list[i].sis_next =
+			    vtophys(&ld->sis_tx_list[0]);
+		} else {
+			ld->sis_tx_list[i].sis_nextdesc =
+			    &ld->sis_tx_list[i + 1];
+			ld->sis_tx_list[i].sis_next =
+			    vtophys(&ld->sis_tx_list[i + 1]);
+		}
+		ld->sis_tx_list[i].sis_mbuf = NULL;
+		ld->sis_tx_list[i].sis_ptr = 0;
+		ld->sis_tx_list[i].sis_ctl = 0;
+	}
+
+	cd->sis_tx_prod = cd->sis_tx_cons = cd->sis_tx_cnt = 0;
+
+	return(0);
+}
+
+
+/*
+ * Initialize the RX descriptors and allocate mbufs for them. Note that
+ * we arrange the descriptors in a closed ring, so that the last descriptor
+ * points back to the first.
+ */
+static int sis_list_rx_init(sc)
+	struct sis_softc	*sc;
+{
+	struct sis_list_data	*ld;
+	struct sis_ring_data	*cd;
+	int			i;
+
+	ld = sc->sis_ldata;
+	cd = &sc->sis_cdata;
+
+	for (i = 0; i < SIS_RX_LIST_CNT; i++) {
+		if (sis_newbuf(sc, &ld->sis_rx_list[i], NULL) == ENOBUFS)
+			return(ENOBUFS);
+		if (i == (SIS_RX_LIST_CNT - 1)) {
+			ld->sis_rx_list[i].sis_nextdesc =
+			    &ld->sis_rx_list[0];
+			ld->sis_rx_list[i].sis_next =
+			    vtophys(&ld->sis_rx_list[0]);
+		} else {
+			ld->sis_rx_list[i].sis_nextdesc =
+			    &ld->sis_rx_list[i + 1];
+			ld->sis_rx_list[i].sis_next =
+			    vtophys(&ld->sis_rx_list[i + 1]);
+		}
+	}
+
+	cd->sis_rx_prod = 0;
+
+	return(0);
+}
+
+/*
+ * Initialize an RX descriptor and attach an MBUF cluster.
+ */
+static int sis_newbuf(sc, c, m)
+	struct sis_softc	*sc;
+	struct sis_desc		*c;
+	struct mbuf		*m;
+{
+	struct mbuf		*m_new = NULL;
+
+	if (m == NULL) {
+		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
+		if (m_new == NULL) {
+			printf("sis%d: no memory for rx list "
+			    "-- packet dropped!\n", sc->sis_unit);
+			return(ENOBUFS);
+		}
+
+		MCLGET(m_new, M_DONTWAIT);
+		if (!(m_new->m_flags & M_EXT)) {
+			printf("sis%d: no memory for rx list "
+			    "-- packet dropped!\n", sc->sis_unit);
+			m_freem(m_new);
+			return(ENOBUFS);
+		}
+		m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
+	} else {
+		m_new = m;
+		m_new->m_len = m_new->m_pkthdr.len = MCLBYTES;
+		m_new->m_data = m_new->m_ext.ext_buf;
+	}
+
+	m_adj(m_new, sizeof(u_int64_t));
+
+	c->sis_mbuf = m_new;
+	c->sis_ptr = vtophys(mtod(m_new, caddr_t));
+	c->sis_ctl = SIS_RXLEN;
+
+	return(0);
+}
+
+/*
+ * A frame has been uploaded: pass the resulting mbuf chain up to
+ * the higher level protocols.
+ */
+static void sis_rxeof(sc)
+	struct sis_softc	*sc;
+{
+        struct ether_header	*eh;
+        struct mbuf		*m;
+        struct ifnet		*ifp;
+	struct sis_desc		*cur_rx;
+	int			i, total_len = 0;
+	u_int32_t		rxstat;
+
+	ifp = &sc->arpcom.ac_if;
+	i = sc->sis_cdata.sis_rx_prod;
+
+	while(SIS_OWNDESC(&sc->sis_ldata->sis_rx_list[i])) {
+		struct mbuf		*m0 = NULL;
+
+		cur_rx = &sc->sis_ldata->sis_rx_list[i];
+		rxstat = cur_rx->sis_rxstat;
+		m = cur_rx->sis_mbuf;
+		cur_rx->sis_mbuf = NULL;
+		total_len = SIS_RXBYTES(cur_rx);
+		SIS_INC(i, SIS_RX_LIST_CNT);
+
+		/*
+		 * If an error occurs, update stats, clear the
+		 * status word and leave the mbuf cluster in place:
+		 * it should simply get re-used next time this descriptor
+	 	 * comes up in the ring.
+		 */
+		if (!(rxstat & SIS_CMDSTS_PKT_OK)) {
+			ifp->if_ierrors++;
+			if (rxstat & SIS_RXSTAT_COLL)
+				ifp->if_collisions++;
+			sis_newbuf(sc, cur_rx, m);
+			continue;
+		}
+
+		/* No errors; receive the packet. */	
+		m0 = m_devget(mtod(m, char *) - ETHER_ALIGN,
+		    total_len + ETHER_ALIGN, 0, ifp, NULL);
+		sis_newbuf(sc, cur_rx, m);
+		if (m0 == NULL) {
+			ifp->if_ierrors++;
+			continue;
+		}
+		m_adj(m0, ETHER_ALIGN);
+		m = m0;
+
+		ifp->if_ipackets++;
+		eh = mtod(m, struct ether_header *);
+#if NBPF > 0
+		/*
+		 * Handle BPF listeners. Let the BPF user see the packet, but
+		 * don't pass it up to the ether_input() layer unless it's
+		 * a broadcast packet, multicast packet, matches our ethernet
+		 * address or the interface is in promiscuous mode.
+		 */
+		if (ifp->if_bpf) {
+			bpf_mtap(ifp, m);
+			if (ifp->if_flags & IFF_PROMISC &&
+			    (bcmp(eh->ether_dhost, sc->arpcom.ac_enaddr,
+			    ETHER_ADDR_LEN) && !(eh->ether_dhost[0] & 1))) {
+				m_freem(m);
+				continue;
+			}
+		}
+#endif
+		/* Remove header from mbuf and pass it on. */
+		m_adj(m, sizeof(struct ether_header));
+		ether_input(ifp, eh, m);
+	}
+
+	sc->sis_cdata.sis_rx_prod = i;
+
+	return;
+}
+
+void sis_rxeoc(sc)
+	struct sis_softc	*sc;
+{
+	sis_rxeof(sc);
+	sis_init(sc);
+	return;
+}
+
+/*
+ * A frame was downloaded to the chip. It's safe for us to clean up
+ * the list buffers.
+ */
+
+static void sis_txeof(sc)
+	struct sis_softc	*sc;
+{
+	struct sis_desc		*cur_tx = NULL;
+	struct ifnet		*ifp;
+	u_int32_t		idx;
+
+	ifp = &sc->arpcom.ac_if;
+
+	/* Clear the timeout timer. */
+	ifp->if_timer = 0;
+
+	/*
+	 * Go through our tx list and free mbufs for those
+	 * frames that have been transmitted.
+	 */
+	idx = sc->sis_cdata.sis_tx_cons;
+	while (idx != sc->sis_cdata.sis_tx_prod) {
+		cur_tx = &sc->sis_ldata->sis_tx_list[idx];
+
+		if (SIS_OWNDESC(cur_tx))
+			break;
+
+		if (cur_tx->sis_ctl & SIS_CMDSTS_MORE) {
+			sc->sis_cdata.sis_tx_cnt--;
+			SIS_INC(idx, SIS_TX_LIST_CNT);
+			continue;
+		}
+
+		if (!(cur_tx->sis_ctl & SIS_CMDSTS_PKT_OK)) {
+			ifp->if_oerrors++;
+			if (cur_tx->sis_txstat & SIS_TXSTAT_EXCESSCOLLS)
+				ifp->if_collisions++;
+			if (cur_tx->sis_txstat & SIS_TXSTAT_OUTOFWINCOLL)
+				ifp->if_collisions++;
+		}
+
+		ifp->if_collisions +=
+		    (cur_tx->sis_txstat & SIS_TXSTAT_COLLCNT) >> 16;
+
+		ifp->if_opackets++;
+		if (cur_tx->sis_mbuf != NULL) {
+			m_freem(cur_tx->sis_mbuf);
+			cur_tx->sis_mbuf = NULL;
+		}
+
+		sc->sis_cdata.sis_tx_cnt--;
+		SIS_INC(idx, SIS_TX_LIST_CNT);
+		ifp->if_timer = 0;
+	}
+
+	sc->sis_cdata.sis_tx_cons = idx;
+
+	if (cur_tx != NULL)
+		ifp->if_flags &= ~IFF_OACTIVE;
+
+	return;
+}
+
+static void sis_tick(xsc)
+	void			*xsc;
+{
+	struct sis_softc	*sc;
+	struct mii_data		*mii;
+	int			s;
+
+	s = splimp();
+
+	sc = xsc;
+	mii = device_get_softc(sc->sis_miibus);
+	mii_tick(mii);
+
+	splx(s);
+
+	return;
+}
+
+static void sis_intr(arg)
+	void			*arg;
+{
+	struct sis_softc	*sc;
+	struct ifnet		*ifp;
+	u_int32_t		status;
+
+	sc = arg;
+	ifp = &sc->arpcom.ac_if;
+
+	/* Supress unwanted interrupts */
+	if (!(ifp->if_flags & IFF_UP)) {
+		sis_stop(sc);
+		return;
+	}
+
+	/* Disable interrupts. */
+	CSR_WRITE_4(sc, SIS_IER, 0);
+
+	for (;;) {
+		/* Reading the ISR register clears all interrupts. */
+		status = CSR_READ_4(sc, SIS_ISR);
+
+		if ((status & SIS_INTRS) == 0)
+			break;
+
+		if ((status & SIS_ISR_TX_OK) ||
+		    (status & SIS_ISR_TX_ERR) ||
+		    (status & SIS_ISR_TX_IDLE))
+			sis_txeof(sc);
+
+		if (status & SIS_ISR_RX_OK)
+			sis_rxeof(sc);
+
+		if ((status & SIS_ISR_RX_ERR) ||
+		    (status & SIS_ISR_RX_OFLOW)) {
+			sis_rxeoc(sc);
+		}
+
+		if (status & SIS_ISR_SYSERR) {
+			sis_reset(sc);
+			sis_init(sc);
+		}
+	}
+
+	/* Re-enable interrupts. */
+	CSR_WRITE_4(sc, SIS_IER, 1);
+
+	if (ifp->if_snd.ifq_head != NULL)
+		sis_start(ifp);
+
+	return;
+}
+
+/*
+ * Encapsulate an mbuf chain in a descriptor by coupling the mbuf data
+ * pointers to the fragment pointers.
+ */
+static int sis_encap(sc, m_head, txidx)
+	struct sis_softc	*sc;
+	struct mbuf		*m_head;
+	u_int32_t		*txidx;
+{
+	struct sis_desc		*f = NULL;
+	struct mbuf		*m;
+	int			frag, cur, cnt = 0;
+
+	/*
+ 	 * Start packing the mbufs in this chain into
+	 * the fragment pointers. Stop when we run out
+ 	 * of fragments or hit the end of the mbuf chain.
+	 */
+	m = m_head;
+	cur = frag = *txidx;
+
+	for (m = m_head; m != NULL; m = m->m_next) {
+		if (m->m_len != 0) {
+			if ((SIS_RX_LIST_CNT -
+			    (sc->sis_cdata.sis_tx_cnt + cnt)) < 2)
+				return(ENOBUFS);
+			f = &sc->sis_ldata->sis_tx_list[frag];
+			f->sis_ctl = SIS_CMDSTS_MORE | m->m_len;
+			f->sis_ptr = vtophys(mtod(m, vm_offset_t));
+			if (cnt != 0)
+				f->sis_ctl |= SIS_CMDSTS_OWN;
+			cur = frag;
+			SIS_INC(frag, SIS_TX_LIST_CNT);
+			cnt++;
+		}
+	}
+
+	if (m != NULL)
+		return(ENOBUFS);
+
+	sc->sis_ldata->sis_tx_list[cur].sis_mbuf = m_head;
+	sc->sis_ldata->sis_tx_list[cur].sis_ctl &= ~SIS_CMDSTS_MORE;
+	sc->sis_ldata->sis_tx_list[*txidx].sis_ctl |= SIS_CMDSTS_OWN;
+	sc->sis_cdata.sis_tx_cnt += cnt;
+	*txidx = frag;
+
+	return(0);
+}
+
+/*
+ * Main transmit routine. To avoid having to do mbuf copies, we put pointers
+ * to the mbuf data regions directly in the transmit lists. We also save a
+ * copy of the pointers since the transmit list fragment pointers are
+ * physical addresses.
+ */
+
+static void sis_start(ifp)
+	struct ifnet		*ifp;
+{
+	struct sis_softc	*sc;
+	struct mbuf		*m_head = NULL;
+	u_int32_t		idx;
+
+	sc = ifp->if_softc;
+
+	idx = sc->sis_cdata.sis_tx_prod;
+
+	if (ifp->if_flags & IFF_OACTIVE)
+		return;
+
+	while(sc->sis_ldata->sis_tx_list[idx].sis_mbuf == NULL) {
+		IF_DEQUEUE(&ifp->if_snd, m_head);
+		if (m_head == NULL)
+			break;
+
+		if (sis_encap(sc, m_head, &idx)) {
+			IF_PREPEND(&ifp->if_snd, m_head);
+			ifp->if_flags |= IFF_OACTIVE;
+			break;
+		}
+
+#if NBPF > 0
+		/*
+		 * If there's a BPF listener, bounce a copy of this frame
+		 * to him.
+		 */
+		if (ifp->if_bpf)
+			bpf_mtap(ifp, m_head);
+#endif
+	}
+
+	/* Transmit */
+	sc->sis_cdata.sis_tx_prod = idx;
+	SIS_SETBIT(sc, SIS_CSR, SIS_CSR_TX_ENABLE);
+
+	/*
+	 * Set a timeout in case the chip goes out to lunch.
+	 */
+	ifp->if_timer = 5;
+
+	return;
+}
+
+static void sis_init(xsc)
+	void			*xsc;
+{
+	struct sis_softc	*sc = xsc;
+	struct ifnet		*ifp = &sc->arpcom.ac_if;
+	struct mii_data		*mii;
+	int			s;
+
+	s = splimp();
+
+	/*
+	 * Cancel pending I/O and free all RX/TX buffers.
+	 */
+	sis_stop(sc);
+
+	mii = device_get_softc(sc->sis_miibus);
+
+	/* Set MAC address */
+	CSR_WRITE_4(sc, SIS_RXFILT_CTL, SIS_FILTADDR_PAR0);
+	CSR_WRITE_4(sc, SIS_RXFILT_DATA,
+	    ((u_int16_t *)sc->arpcom.ac_enaddr)[0]);
+	CSR_WRITE_4(sc, SIS_RXFILT_CTL, SIS_FILTADDR_PAR1);
+	CSR_WRITE_4(sc, SIS_RXFILT_DATA,
+	    ((u_int16_t *)sc->arpcom.ac_enaddr)[1]);
+	CSR_WRITE_4(sc, SIS_RXFILT_CTL, SIS_FILTADDR_PAR2);
+	CSR_WRITE_4(sc, SIS_RXFILT_DATA,
+	    ((u_int16_t *)sc->arpcom.ac_enaddr)[2]);
+
+	/* Init circular RX list. */
+	if (sis_list_rx_init(sc) == ENOBUFS) {
+		printf("sis%d: initialization failed: no "
+			"memory for rx buffers\n", sc->sis_unit);
+		sis_stop(sc);
+		(void)splx(s);
+		return;
+	}
+
+	/*
+	 * Init tx descriptors.
+	 */
+	sis_list_tx_init(sc);
+
+	 /* If we want promiscuous mode, set the allframes bit. */
+	if (ifp->if_flags & IFF_PROMISC) {
+		SIS_SETBIT(sc, SIS_RXFILT_CTL, SIS_RXFILTCTL_ALLPHYS);
+	} else {
+		SIS_CLRBIT(sc, SIS_RXFILT_CTL, SIS_RXFILTCTL_ALLPHYS);
+	}
+
+	/*
+	 * Set the capture broadcast bit to capture broadcast frames.
+	 */
+	if (ifp->if_flags & IFF_BROADCAST) {
+		SIS_SETBIT(sc, SIS_RXFILT_CTL, SIS_RXFILTCTL_BROAD);
+	} else {
+		SIS_CLRBIT(sc, SIS_RXFILT_CTL, SIS_RXFILTCTL_BROAD);
+	}
+
+	/*
+	 * Load the multicast filter.
+	 */
+	sis_setmulti(sc);
+
+	/* Turn the receive filter on */
+	SIS_SETBIT(sc, SIS_RXFILT_CTL, SIS_RXFILTCTL_ENABLE);
+
+	/*
+	 * Load the address of the RX and TX lists.
+	 */
+	CSR_WRITE_4(sc, SIS_RX_LISTPTR,
+	    vtophys(&sc->sis_ldata->sis_rx_list[0]));
+	CSR_WRITE_4(sc, SIS_TX_LISTPTR,
+	    vtophys(&sc->sis_ldata->sis_tx_list[0]));
+
+	/* Set RX configuration */
+	CSR_WRITE_4(sc, SIS_RX_CFG, SIS_RXCFG);
+	/* Set TX configuration */
+	CSR_WRITE_4(sc, SIS_TX_CFG, SIS_TXCFG);
+
+	/*
+	 * Enable interrupts.
+	 */
+	CSR_WRITE_4(sc, SIS_IMR, SIS_INTRS);
+	CSR_WRITE_4(sc, SIS_IER, 1);
+
+	/* Enable receiver and transmitter. */
+	SIS_CLRBIT(sc, SIS_CSR, SIS_CSR_TX_DISABLE|SIS_CSR_RX_DISABLE);
+	SIS_SETBIT(sc, SIS_CSR, SIS_CSR_RX_ENABLE);
+
+	mii_mediachg(mii);
+
+	ifp->if_flags |= IFF_RUNNING;
+	ifp->if_flags &= ~IFF_OACTIVE;
+
+	(void)splx(s);
+
+	sc->sis_stat_ch = timeout(sis_tick, sc, hz);
+
+	return;
+}
+
+/*
+ * Set media options.
+ */
+static int sis_ifmedia_upd(ifp)
+	struct ifnet		*ifp;
+{
+	struct sis_softc	*sc;
+
+	sc = ifp->if_softc;
+
+	if (ifp->if_flags & IFF_UP)
+		sis_init(sc);
+
+	return(0);
+}
+
+/*
+ * Report current media status.
+ */
+static void sis_ifmedia_sts(ifp, ifmr)
+	struct ifnet		*ifp;
+	struct ifmediareq	*ifmr;
+{
+	struct sis_softc	*sc;
+	struct mii_data		*mii;
+
+	sc = ifp->if_softc;
+
+	mii = device_get_softc(sc->sis_miibus);
+	mii_pollstat(mii);
+	ifmr->ifm_active = mii->mii_media_active;
+	ifmr->ifm_status = mii->mii_media_status;
+
+	return;
+}
+
+static int sis_ioctl(ifp, command, data)
+	struct ifnet		*ifp;
+	u_long			command;
+	caddr_t			data;
+{
+	struct sis_softc	*sc = ifp->if_softc;
+	struct ifreq		*ifr = (struct ifreq *) data;
+	struct mii_data		*mii;
+	int			s, error = 0;
+
+	s = splimp();
+
+	switch(command) {
+	case SIOCSIFADDR:
+	case SIOCGIFADDR:
+	case SIOCSIFMTU:
+		error = ether_ioctl(ifp, command, data);
+		break;
+	case SIOCSIFFLAGS:
+		if (ifp->if_flags & IFF_UP) {
+			sis_init(sc);
+		} else {
+			if (ifp->if_flags & IFF_RUNNING)
+				sis_stop(sc);
+		}
+		error = 0;
+		break;
+	case SIOCADDMULTI:
+	case SIOCDELMULTI:
+		sis_setmulti(sc);
+		error = 0;
+		break;
+	case SIOCGIFMEDIA:
+	case SIOCSIFMEDIA:
+		mii = device_get_softc(sc->sis_miibus);
+		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
+		break;
+	default:
+		error = EINVAL;
+		break;
+	}
+
+	(void)splx(s);
+
+	return(error);
+}
+
+static void sis_watchdog(ifp)
+	struct ifnet		*ifp;
+{
+	struct sis_softc	*sc;
+
+	sc = ifp->if_softc;
+
+	ifp->if_oerrors++;
+	printf("sis%d: watchdog timeout\n", sc->sis_unit);
+
+	sis_stop(sc);
+	sis_reset(sc);
+	sis_init(sc);
+
+	if (ifp->if_snd.ifq_head != NULL)
+		sis_start(ifp);
+
+	return;
+}
+
+/*
+ * Stop the adapter and free any mbufs allocated to the
+ * RX and TX lists.
+ */
+static void sis_stop(sc)
+	struct sis_softc	*sc;
+{
+	register int		i;
+	struct ifnet		*ifp;
+
+	ifp = &sc->arpcom.ac_if;
+	ifp->if_timer = 0;
+
+	untimeout(sis_tick, sc, sc->sis_stat_ch);
+	CSR_WRITE_4(sc, SIS_IER, 0);
+	CSR_WRITE_4(sc, SIS_IMR, 0);
+	SIS_SETBIT(sc, SIS_CSR, SIS_CSR_TX_DISABLE|SIS_CSR_RX_DISABLE);
+	DELAY(1000);
+	CSR_WRITE_4(sc, SIS_TX_LISTPTR, 0);
+	CSR_WRITE_4(sc, SIS_RX_LISTPTR, 0);
+
+	/*
+	 * Free data in the RX lists.
+	 */
+	for (i = 0; i < SIS_RX_LIST_CNT; i++) {
+		if (sc->sis_ldata->sis_rx_list[i].sis_mbuf != NULL) {
+			m_freem(sc->sis_ldata->sis_rx_list[i].sis_mbuf);
+			sc->sis_ldata->sis_rx_list[i].sis_mbuf = NULL;
+		}
+	}
+	bzero((char *)&sc->sis_ldata->sis_rx_list,
+		sizeof(sc->sis_ldata->sis_rx_list));
+
+	/*
+	 * Free the TX list buffers.
+	 */
+	for (i = 0; i < SIS_TX_LIST_CNT; i++) {
+		if (sc->sis_ldata->sis_tx_list[i].sis_mbuf != NULL) {
+			m_freem(sc->sis_ldata->sis_tx_list[i].sis_mbuf);
+			sc->sis_ldata->sis_tx_list[i].sis_mbuf = NULL;
+		}
+	}
+
+	bzero((char *)&sc->sis_ldata->sis_tx_list,
+		sizeof(sc->sis_ldata->sis_tx_list));
+
+	ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+
+	return;
+}
+
+/*
+ * Stop all chip I/O so that the kernel's probe routines don't
+ * get confused by errant DMAs when rebooting.
+ */
+static void sis_shutdown(dev)
+	device_t		dev;
+{
+	struct sis_softc	*sc;
+
+	sc = device_get_softc(dev);
+
+	sis_reset(sc);
+	sis_stop(sc);
+
+	return;
+}
diff --git a/sys/pci/if_sisreg.h b/sys/pci/if_sisreg.h
new file mode 100644
index 0000000..cef3a52
--- /dev/null
+++ b/sys/pci/if_sisreg.h
@@ -0,0 +1,404 @@
+/*
+ * Copyright (c) 1997, 1998, 1999
+ *	Bill Paul <wpaul@ee.columbia.edu>.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Bill Paul.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Register definitions for the SiS 900 and SiS 7016 chipsets. The
+ * 7016 is actually an older chip and some of its registers differ
+ * from the 900, however the core operational registers are the same:
+ * the differences lie in the OnNow/Wake on LAN stuff which we don't
+ * use anyway. The 7016 needs an external MII compliant PHY while the
+ * SiS 900 has one built in. All registers are 32-bits wide.
+ */
+
+/* Registers common to SiS 900 and SiS 7016 */
+#define SIS_CSR			0x00
+#define SIS_CFG			0x04
+#define SIS_EECTL		0x08
+#define SIS_PCICTL		0x0C
+#define SIS_ISR			0x10
+#define SIS_IMR			0x14
+#define SIS_IER			0x18
+#define SIS_PHYCTL		0x1C
+#define SIS_TX_LISTPTR		0x20
+#define SIS_TX_CFG		0x24
+#define SIS_RX_LISTPTR		0x30
+#define SIS_RX_CFG		0x34
+#define SIS_FLOWCTL		0x38
+#define SIS_RXFILT_CTL		0x48
+#define SIS_RXFILT_DATA		0x4C
+#define SIS_PWRMAN_CTL		0xB0
+#define SIS_PWERMAN_WKUP_EVENT	0xB4
+#define SIS_WKUP_FRAME_CRC	0xBC
+#define SIS_WKUP_FRAME_MASK0	0xC0
+#define SIS_WKUP_FRAME_MASKXX	0xEC
+
+/* SiS 7016 specific registers */
+#define SIS_SILICON_REV		0x5C
+#define SIS_MIB_CTL0		0x60
+#define SIS_MIB_CTL1		0x64
+#define SIS_MIB_CTL2		0x68
+#define SIS_MIB_CTL3		0x6C
+#define SIS_MIB			0x80
+#define SIS_LINKSTS		0xA0
+#define SIS_TIMEUNIT		0xA4
+#define SIS_GPIO		0xB8
+
+#define SIS_CSR_TX_ENABLE	0x00000001
+#define SIS_CSR_TX_DISABLE	0x00000002
+#define SIS_CSR_RX_ENABLE	0x00000004
+#define SIS_CSR_RX_DISABLE	0x00000008
+#define SIS_CSR_TX_RESET	0x00000010
+#define SIS_CSR_RX_RESET	0x00000020
+#define SIS_CSR_SOFTINTR	0x00000080
+#define SIS_CSR_RESET		0x00000100
+
+#define SIS_CFG_BIGENDIAN	0x00000001
+#define SIS_CFG_PERR_DETECT	0x00000008
+#define SIS_CFG_DEFER_DISABLE	0x00000010
+#define SIS_CFG_OUTOFWIN_TIMER	0x00000020
+#define SIS_CFG_SINGLE_BACKOFF	0x00000040
+#define SIS_CFG_PCIREQ_ALG	0x00000080
+
+#define SIS_EECTL_DIN		0x00000001
+#define SIS_EECTL_DOUT		0x00000002
+#define SIS_EECTL_CLK		0x00000004
+#define SIS_EECTL_CSEL		0x00000008
+
+#define SIS_EECMD_WRITE		0x140
+#define SIS_EECMD_READ		0x180
+#define SIS_EECMD_ERASE		0x1c0
+
+#define SIS_EE_NODEADDR		0x8
+
+#define SIS_PCICTL_SRAMADDR	0x0000001F
+#define SIS_PCICTL_RAMTSTENB	0x00000020
+#define SIS_PCICTL_TXTSTENB	0x00000040
+#define SIS_PCICTL_RXTSTENB	0x00000080
+#define SIS_PCICTL_BMTSTENB	0x00000200
+#define SIS_PCICTL_RAMADDR	0x001F0000
+#define SIS_PCICTL_ROMTIME	0x0F000000
+#define SIS_PCICTL_DISCTEST	0x40000000
+
+#define SIS_ISR_RX_OK		0x00000001
+#define SIS_ISR_RX_DESC_OK	0x00000002
+#define SIS_ISR_RX_ERR		0x00000004
+#define SIS_ISR_RX_EARLY	0x00000008
+#define SIS_ISR_RX_IDLE		0x00000010
+#define SIS_ISR_RX_OFLOW	0x00000020
+#define SIS_ISR_TX_OK		0x00000040
+#define SIS_ISR_TX_DESC_OK	0x00000080
+#define SIS_ISR_TX_ERR		0x00000100
+#define SIS_ISR_TX_IDLE		0x00000200
+#define SIS_ISR_TX_UFLOW	0x00000400
+#define SIS_ISR_SOFTINTR	0x00000800
+#define SIS_ISR_HIBITS		0x00008000
+#define SIS_ISR_RX_FIFO_OFLOW	0x00010000
+#define SIS_ISR_TGT_ABRT	0x00100000
+#define SIS_ISR_BM_ABRT		0x00200000
+#define SIS_ISR_SYSERR		0x00400000
+#define SIS_ISR_PARITY_ERR	0x00800000
+#define SIS_ISR_RX_RESET_DONE	0x01000000
+#define SIS_ISR_TX_RESET_DONE	0x02000000
+#define SIS_ISR_TX_PAUSE_START	0x04000000
+#define SIS_ISR_TX_PAUSE_DONE	0x08000000
+#define SIS_ISR_WAKE_EVENT	0x10000000
+
+#define SIS_IMR_RX_OK		0x00000001
+#define SIS_IMR_RX_DESC_OK	0x00000002
+#define SIS_IMR_RX_ERR		0x00000004
+#define SIS_IMR_RX_EARLY	0x00000008
+#define SIS_IMR_RX_IDLE		0x00000010
+#define SIS_IMR_RX_OFLOW	0x00000020
+#define SIS_IMR_TX_OK		0x00000040
+#define SIS_IMR_TX_DESC_OK	0x00000080
+#define SIS_IMR_TX_ERR		0x00000100
+#define SIS_IMR_TX_IDLE		0x00000200
+#define SIS_IMR_TX_UFLOW	0x00000400
+#define SIS_IMR_SOFTINTR	0x00000800
+#define SIS_IMR_HIBITS		0x00008000
+#define SIS_IMR_RX_FIFO_OFLOW	0x00010000
+#define SIS_IMR_TGT_ABRT	0x00100000
+#define SIS_IMR_BM_ABRT		0x00200000
+#define SIS_IMR_SYSERR		0x00400000
+#define SIS_IMR_PARITY_ERR	0x00800000
+#define SIS_IMR_RX_RESET_DONE	0x01000000
+#define SIS_IMR_TX_RESET_DONE	0x02000000
+#define SIS_IMR_TX_PAUSE_START	0x04000000
+#define SIS_IMR_TX_PAUSE_DONE	0x08000000
+#define SIS_IMR_WAKE_EVENT	0x10000000
+
+#define SIS_INTRS	\
+	(SIS_IMR_RX_OFLOW|SIS_IMR_TX_UFLOW|SIS_IMR_TX_OK|\
+	 SIS_IMR_TX_IDLE|SIS_IMR_RX_OK|SIS_IMR_RX_ERR|\
+	 SIS_IMR_SYSERR)
+
+#define SIS_IER_INTRENB		0x00000001
+
+#define SIS_PHYCTL_ACCESS	0x00000010
+#define SIS_PHYCTL_OP		0x00000020
+#define SIS_PHYCTL_REGADDR	0x000007C0
+#define SIS_PHYCTL_PHYADDR	0x0000F800
+#define SIS_PHYCTL_PHYDATA	0xFFFF0000
+
+#define SIS_PHYOP_READ		0x00000020
+#define SIS_PHYOP_WRITE		0x00000000
+
+#define SIS_TXCFG_DRAIN_THRESH	0x0000003F /* 32-byte units */
+#define SIS_TXCFG_FILL_THRESH	0x00003F00 /* 32-byte units */
+#define SIS_TXCFG_DMABURST	0x00700000
+#define SIS_TXCFG_AUTOPAD	0x10000000
+#define SIS_TXCFG_LOOPBK	0x20000000
+#define SIS_TXCFG_IGN_HBEAT	0x40000000
+#define SIS_TXCFG_IGN_CARR	0x80000000
+
+#define SIS_TXCFG_DRAIN(x)	(((x) >> 5) & SIS_TXCFG_DRAIN_THRESH)
+#define SIS_TXCFG_FILL(x)	((((x) >> 5) << 8) & SIS_TXCFG_FILL_THRESH)
+
+#define SIS_TXDMA_512BYTES	0x00000000
+#define SIS_TXDMA_4BYTES	0x00100000
+#define SIS_TXDMA_8BYTES	0x00200000
+#define SIS_TXDMA_16BYTES	0x00300000
+#define SIS_TXDMA_32BYTES	0x00400000
+#define SIS_TXDMA_64BYTES	0x00500000
+#define SIS_TXDMA_128BYTES	0x00600000
+#define SIS_TXDMA_256BYTES	0x00700000
+
+#define SIS_TXCFG	\
+	(SIS_TXDMA_64BYTES|SIS_TXCFG_AUTOPAD|\
+	 SIS_TXCFG_FILL(64)|SIS_TXCFG_DRAIN(1500))
+
+#define SIS_RXCFG_DRAIN_THRESH	0x0000003E /* 8-byte units */
+#define SIS_RXCFG_DMABURST	0x00700000
+#define SIS_RXCFG_RX_JABBER	0x08000000
+#define SIS_RXCFG_RX_TXPKTS	0x10000000
+#define SIS_RXCFG_RX_RUNTS	0x40000000
+#define SIS_RXCFG_RX_GIANTS	0x80000000
+
+#define SIS_RXCFG_DRAIN(x)	((((x) >> 3) << 1) & SIS_RXCFG_DRAIN_THRESH)
+
+#define SIS_RXDMA_512BYTES	0x00000000
+#define SIS_RXDMA_4BYTES	0x00100000
+#define SIS_RXDMA_8BYTES	0x00200000
+#define SIS_RXDMA_16BYTES	0x00300000
+#define SIS_RXDMA_32BYTES	0x00400000
+#define SIS_RXDMA_64BYTES	0x00500000
+#define SIS_RXDMA_128BYTES	0x00600000
+#define SIS_RXDMA_256BYTES	0x00700000
+
+#define SIS_RXCFG \
+	(SIS_RXCFG_DRAIN(64)|SIS_RXDMA_256BYTES)
+
+#define SIS_RXFILTCTL_ADDR	0x000F0000
+#define SIS_RXFILTCTL_ALLPHYS	0x10000000
+#define SIS_RXFILTCTL_ALLMULTI	0x20000000
+#define SIS_RXFILTCTL_BROAD	0x40000000
+#define SIS_RXFILTCTL_ENABLE	0x80000000
+
+#define SIS_FILTADDR_PAR0	0x00000000
+#define SIS_FILTADDR_PAR1	0x00010000
+#define SIS_FILTADDR_PAR2	0x00020000
+#define SIS_FILTADDR_MAR0	0x00040000
+#define SIS_FILTADDR_MAR1	0x00050000
+#define SIS_FILTADDR_MAR2	0x00060000
+#define SIS_FILTADDR_MAR3	0x00070000
+#define SIS_FILTADDR_MAR4	0x00080000
+#define SIS_FILTADDR_MAR5	0x00090000
+#define SIS_FILTADDR_MAR6	0x000A0000
+#define SIS_FILTADDR_MAR7	0x000B0000
+
+/*
+ * DMA descriptor structures. The first part of the descriptor
+ * is the hardware descriptor format, which is just three longwords.
+ * After this, we include some additional structure members for
+ * use by the driver. Note that for this structure will be a different
+ * size on the alpha, but that's okay as long as it's a multiple of 4
+ * bytes in size.
+ */
+struct sis_desc {
+	/* SiS hardware descriptor section */
+	u_int32_t		sis_next;
+	u_int32_t		sis_cmdsts;
+#define sis_rxstat		sis_cmdsts
+#define sis_txstat		sis_cmdsts
+#define sis_ctl			sis_cmdsts
+	u_int32_t		sis_ptr;
+	/* Driver software section */
+	struct mbuf		*sis_mbuf;
+	struct sis_desc		*sis_nextdesc;
+};
+
+#define SIS_CMDSTS_BUFLEN	0x00000FFF
+#define SIS_CMDSTS_PKT_OK	0x08000000
+#define SIS_CMDSTS_CRC		0x10000000
+#define SIS_CMDSTS_INTR		0x20000000
+#define SIS_CMDSTS_MORE		0x40000000
+#define SIS_CMDSTS_OWN		0x80000000
+
+#define SIS_LASTDESC(x)		(!((x)->sis_ctl & SIS_CMDSTS_MORE)))
+#define SIS_OWNDESC(x)		((x)->sis_ctl & SIS_CMDSTS_OWN)
+#define SIS_INC(x, y)		(x) = (x + 1) % y
+#define SIS_RXBYTES(x)		((x)->sis_ctl & SIS_CMDSTS_BUFLEN)
+
+#define SIS_RXSTAT_COLL		0x00010000
+#define SIS_RXSTAT_LOOPBK	0x00020000
+#define SIS_RXSTAT_ALIGNERR	0x00040000
+#define SIS_RXSTAT_CRCERR	0x00080000
+#define SIS_RXSTAT_SYMBOLERR	0x00100000
+#define SIS_RXSTAT_RUNT		0x00200000
+#define SIS_RXSTAT_GIANT	0x00400000
+#define SIS_RXSTAT_DSTCLASS	0x01800000
+#define SIS_RXSTAT_OVERRUN	0x02000000
+#define SIS_RXSTAT_RX_ABORT	0x04000000
+
+#define SIS_DSTCLASS_REJECT	0x00000000
+#define SIS_DSTCLASS_UNICAST	0x00800000
+#define SIS_DSTCLASS_MULTICAST	0x01000000
+#define SIS_DSTCLASS_BROADCAST	0x02000000
+
+#define SIS_TXSTAT_COLLCNT	0x000F0000
+#define SIS_TXSTAT_EXCESSCOLLS	0x00100000
+#define SIS_TXSTAT_OUTOFWINCOLL	0x00200000
+#define SIS_TXSTAT_EXCESS_DEFER	0x00400000
+#define SIS_TXSTAT_DEFERED	0x00800000
+#define SIS_TXSTAT_CARR_LOST	0x01000000
+#define SIS_TXSTAT_UNDERRUN	0x02000000
+#define SIS_TXSTAT_TX_ABORT	0x04000000
+
+#define SIS_RX_LIST_CNT		64
+#define SIS_TX_LIST_CNT		128
+
+struct sis_list_data {
+	struct sis_desc		sis_rx_list[SIS_RX_LIST_CNT];
+	struct sis_desc		sis_tx_list[SIS_TX_LIST_CNT];
+};
+
+struct sis_ring_data {
+	int			sis_rx_prod;
+	int			sis_tx_prod;
+	int			sis_tx_cons;
+	int			sis_tx_cnt;
+};
+
+
+/*
+ * SiS PCI vendor ID.
+ */
+#define SIS_VENDORID		0x1039
+
+/*
+ * SiS PCI device IDs
+ */
+#define SIS_DEVICEID_900	0x0900
+#define SIS_DEVICEID_7016	0x7016
+
+struct sis_type {
+	u_int16_t		sis_vid;
+	u_int16_t		sis_did;
+	char			*sis_name;
+};
+
+#define SIS_TYPE_900	1
+#define SIS_TYPE_7016	2
+
+struct sis_softc {
+	struct arpcom		arpcom;		/* interface info */
+	bus_space_handle_t	sis_bhandle;
+	bus_space_tag_t		sis_btag;
+	struct resource		*sis_res;
+	struct resource		*sis_irq;
+	void			*sis_intrhand;
+	device_t		sis_miibus;
+	u_int8_t		sis_unit;
+	u_int8_t		sis_type;
+	struct sis_list_data	*sis_ldata;
+	struct sis_ring_data	sis_cdata;
+	struct callout_handle	sis_stat_ch;
+};
+
+/*
+ * register space access macros
+ */
+#define CSR_WRITE_4(sc, reg, val)	\
+	bus_space_write_4(sc->sis_btag, sc->sis_bhandle, reg, val)
+
+#define CSR_READ_4(sc, reg)		\
+	bus_space_read_4(sc->sis_btag, sc->sis_bhandle, reg)
+
+#define SIS_TIMEOUT		1000
+#define ETHER_ALIGN		2
+#define SIS_RXLEN		1536
+#define SIS_MIN_FRAMELEN	60
+
+/*
+ * PCI low memory base and low I/O base register, and
+ * other PCI registers.
+ */
+
+#define SIS_PCI_VENDOR_ID	0x00
+#define SIS_PCI_DEVICE_ID	0x02
+#define SIS_PCI_COMMAND		0x04
+#define SIS_PCI_STATUS		0x06
+#define SIS_PCI_REVID		0x08
+#define SIS_PCI_CLASSCODE	0x09
+#define SIS_PCI_CACHELEN	0x0C
+#define SIS_PCI_LATENCY_TIMER	0x0D
+#define SIS_PCI_HEADER_TYPE	0x0E
+#define SIS_PCI_LOIO		0x10
+#define SIS_PCI_LOMEM		0x14
+#define SIS_PCI_BIOSROM		0x30
+#define SIS_PCI_INTLINE		0x3C
+#define SIS_PCI_INTPIN		0x3D
+#define SIS_PCI_MINGNT		0x3E
+#define SIS_PCI_MINLAT		0x0F
+#define SIS_PCI_RESETOPT	0x48
+#define SIS_PCI_EEPROM_DATA	0x4C
+
+/* power management registers */
+#define SIS_PCI_CAPID		0x50 /* 8 bits */
+#define SIS_PCI_NEXTPTR		0x51 /* 8 bits */
+#define SIS_PCI_PWRMGMTCAP	0x52 /* 16 bits */
+#define SIS_PCI_PWRMGMTCTRL	0x54 /* 16 bits */
+
+#define SIS_PSTATE_MASK		0x0003
+#define SIS_PSTATE_D0		0x0000
+#define SIS_PSTATE_D1		0x0001
+#define SIS_PSTATE_D2		0x0002
+#define SIS_PSTATE_D3		0x0003
+#define SIS_PME_EN		0x0010
+#define SIS_PME_STATUS		0x8000
+
+#ifdef __alpha__
+#undef vtophys
+#define vtophys(va)		alpha_XXX_dmamap((vm_offset_t)va)
+#endif
diff --git a/usr.sbin/sade/devices.c b/usr.sbin/sade/devices.c
index f0df3a2..878e4e8 100644
--- a/usr.sbin/sade/devices.c
+++ b/usr.sbin/sade/devices.c
@@ -103,6 +103,7 @@ static struct _devname {
     { DEVICE_TYPE_NETWORK,	"pn",		"Lite-On 82168/82169 PNIC PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"rl",		"RealTek 8129/8139 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"sf",		"Adaptec AIC-6915 PCI ethernet card"		},
+    { DEVICE_TYPE_NETWORK,	"sis",		"SiS 900/SiS 7016 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"ste",		"Sundance ST201 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"sk",		"SysKonnect PCI gigabit ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"tx",		"SMC 9432TX ethernet card"					},
diff --git a/usr.sbin/sysinstall/devices.c b/usr.sbin/sysinstall/devices.c
index f0df3a2..878e4e8 100644
--- a/usr.sbin/sysinstall/devices.c
+++ b/usr.sbin/sysinstall/devices.c
@@ -103,6 +103,7 @@ static struct _devname {
     { DEVICE_TYPE_NETWORK,	"pn",		"Lite-On 82168/82169 PNIC PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"rl",		"RealTek 8129/8139 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"sf",		"Adaptec AIC-6915 PCI ethernet card"		},
+    { DEVICE_TYPE_NETWORK,	"sis",		"SiS 900/SiS 7016 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"ste",		"Sundance ST201 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"sk",		"SysKonnect PCI gigabit ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"tx",		"SMC 9432TX ethernet card"					},