Deleted Added
full compact
if_sis.c (69583) if_sis.c (71228)
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 69583 2000-12-04 22:46:50Z wpaul $
32 * $FreeBSD: head/sys/pci/if_sis.c 71228 2001-01-19 01:59:14Z bmilekic $
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 69583 2000-12-04 22:46:50Z wpaul $";
102 "$FreeBSD: head/sys/pci/if_sis.c 71228 2001-01-19 01:59:14Z bmilekic $";
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" },

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

633 struct sis_softc *sc;
634 struct ifnet *ifp;
635 int unit, error = 0, rid;
636
637 sc = device_get_softc(dev);
638 unit = device_get_unit(dev);
639 bzero(sc, sizeof(struct sis_softc));
640
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" },

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

633 struct sis_softc *sc;
634 struct ifnet *ifp;
635 int unit, error = 0, rid;
636
637 sc = device_get_softc(dev);
638 unit = device_get_unit(dev);
639 bzero(sc, sizeof(struct sis_softc));
640
641 mtx_init(&sc->sis_mtx, device_get_nameunit(dev), MTX_DEF);
641 mtx_init(&sc->sis_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
642 SIS_LOCK(sc);
643
644 if (pci_get_device(dev) == SIS_DEVICEID_900)
645 sc->sis_type = SIS_TYPE_900;
646 if (pci_get_device(dev) == SIS_DEVICEID_7016)
647 sc->sis_type = SIS_TYPE_7016;
648 if (pci_get_vendor(dev) == NS_VENDORID)
649 sc->sis_type = SIS_TYPE_83815;

--- 1030 unchanged lines hidden ---
642 SIS_LOCK(sc);
643
644 if (pci_get_device(dev) == SIS_DEVICEID_900)
645 sc->sis_type = SIS_TYPE_900;
646 if (pci_get_device(dev) == SIS_DEVICEID_7016)
647 sc->sis_type = SIS_TYPE_7016;
648 if (pci_get_vendor(dev) == NS_VENDORID)
649 sc->sis_type = SIS_TYPE_83815;

--- 1030 unchanged lines hidden ---