Deleted Added
full compact
if_sis.c (78508) if_sis.c (79472)
1/*
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
1/*
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/pci/if_sis.c 78508 2001-06-20 19:48:35Z bmilekic $
32 * $FreeBSD: head/sys/pci/if_sis.c 79472 2001-07-09 17:58:42Z wpaul $
33 */
34
35/*
36 * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are
37 * available from http://www.sis.com.tw.
38 *
39 * This driver also supports the NatSemi DP83815. Datasheets are
40 * available from http://www.national.com.

--- 53 unchanged lines hidden (view full) ---

94
95MODULE_DEPEND(sis, miibus, 1, 1, 1);
96
97/* "controller miibus0" required. See GENERIC if you get errors here. */
98#include "miibus_if.h"
99
100#ifndef lint
101static const char rcsid[] =
33 */
34
35/*
36 * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are
37 * available from http://www.sis.com.tw.
38 *
39 * This driver also supports the NatSemi DP83815. Datasheets are
40 * available from http://www.national.com.

--- 53 unchanged lines hidden (view full) ---

94
95MODULE_DEPEND(sis, miibus, 1, 1, 1);
96
97/* "controller miibus0" required. See GENERIC if you get errors here. */
98#include "miibus_if.h"
99
100#ifndef lint
101static const char rcsid[] =
102 "$FreeBSD: head/sys/pci/if_sis.c 78508 2001-06-20 19:48:35Z bmilekic $";
102 "$FreeBSD: head/sys/pci/if_sis.c 79472 2001-07-09 17:58:42Z wpaul $";
103#endif
104
105/*
106 * Various supported device vendors/types and their names.
107 */
108static struct sis_type sis_devs[] = {
109 { SIS_VENDORID, SIS_DEVICEID_900, "SiS 900 10/100BaseTX" },
110 { SIS_VENDORID, SIS_DEVICEID_7016, "SiS 7016 10/100BaseTX" },

--- 640 unchanged lines hidden (view full) ---

751 pci_write_config(dev, SIS_PCI_LOMEM, membase, 4);
752 pci_write_config(dev, SIS_PCI_INTLINE, irq, 4);
753 }
754
755 /*
756 * Map control/status registers.
757 */
758 pci_enable_busmaster(dev);
103#endif
104
105/*
106 * Various supported device vendors/types and their names.
107 */
108static struct sis_type sis_devs[] = {
109 { SIS_VENDORID, SIS_DEVICEID_900, "SiS 900 10/100BaseTX" },
110 { SIS_VENDORID, SIS_DEVICEID_7016, "SiS 7016 10/100BaseTX" },

--- 640 unchanged lines hidden (view full) ---

751 pci_write_config(dev, SIS_PCI_LOMEM, membase, 4);
752 pci_write_config(dev, SIS_PCI_INTLINE, irq, 4);
753 }
754
755 /*
756 * Map control/status registers.
757 */
758 pci_enable_busmaster(dev);
759 pci_enable_io(dev, PCIM_CMD_PORTEN);
760 pci_enable_io(dev, PCIM_CMD_MEMEN);
759 pci_enable_io(dev, SYS_RES_IOPORT);
760 pci_enable_io(dev, SYS_RES_MEMORY);
761 command = pci_read_config(dev, PCIR_COMMAND, 4);
762
763#ifdef SIS_USEIOSPACE
764 if (!(command & PCIM_CMD_PORTEN)) {
765 printf("sis%d: failed to enable I/O ports!\n", unit);
766 error = ENXIO;;
767 goto fail;
768 }

--- 1008 unchanged lines hidden ---
761 command = pci_read_config(dev, PCIR_COMMAND, 4);
762
763#ifdef SIS_USEIOSPACE
764 if (!(command & PCIM_CMD_PORTEN)) {
765 printf("sis%d: failed to enable I/O ports!\n", unit);
766 error = ENXIO;;
767 goto fail;
768 }

--- 1008 unchanged lines hidden ---