Deleted Added
full compact
if_sk.c (69583) if_sk.c (71228)
1/*
2 * Copyright (c) 1997, 1998, 1999, 2000
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, 2000
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/dev/sk/if_sk.c 69583 2000-12-04 22:46:50Z wpaul $
32 * $FreeBSD: head/sys/dev/sk/if_sk.c 71228 2001-01-19 01:59:14Z bmilekic $
33 */
34
35/*
36 * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
37 * the SK-984x series adapters, both single port and dual port.
38 * References:
39 * The XaQti XMAC II datasheet,
40 * http://www.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf

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

108
109MODULE_DEPEND(sk, miibus, 1, 1, 1);
110
111/* "controller miibus0" required. See GENERIC if you get errors here. */
112#include "miibus_if.h"
113
114#ifndef lint
115static const char rcsid[] =
33 */
34
35/*
36 * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
37 * the SK-984x series adapters, both single port and dual port.
38 * References:
39 * The XaQti XMAC II datasheet,
40 * http://www.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf

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

108
109MODULE_DEPEND(sk, miibus, 1, 1, 1);
110
111/* "controller miibus0" required. See GENERIC if you get errors here. */
112#include "miibus_if.h"
113
114#ifndef lint
115static const char rcsid[] =
116 "$FreeBSD: head/sys/dev/sk/if_sk.c 69583 2000-12-04 22:46:50Z wpaul $";
116 "$FreeBSD: head/sys/dev/sk/if_sk.c 71228 2001-01-19 01:59:14Z bmilekic $";
117#endif
118
119static struct sk_type sk_devs[] = {
120 { SK_VENDORID, SK_DEVICEID_GE, "SysKonnect Gigabit Ethernet" },
121 { 0, 0, NULL }
122};
123
124static int sk_probe __P((device_t));

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

1189 u_int32_t command;
1190 struct sk_softc *sc;
1191 int unit, error = 0, rid, *port;
1192
1193 sc = device_get_softc(dev);
1194 unit = device_get_unit(dev);
1195 bzero(sc, sizeof(struct sk_softc));
1196
117#endif
118
119static struct sk_type sk_devs[] = {
120 { SK_VENDORID, SK_DEVICEID_GE, "SysKonnect Gigabit Ethernet" },
121 { 0, 0, NULL }
122};
123
124static int sk_probe __P((device_t));

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

1189 u_int32_t command;
1190 struct sk_softc *sc;
1191 int unit, error = 0, rid, *port;
1192
1193 sc = device_get_softc(dev);
1194 unit = device_get_unit(dev);
1195 bzero(sc, sizeof(struct sk_softc));
1196
1197 mtx_init(&sc->sk_mtx, device_get_nameunit(dev), MTX_DEF);
1197 mtx_init(&sc->sk_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
1198 SK_LOCK(sc);
1199
1200 /*
1201 * Handle power management nonsense.
1202 */
1203 command = pci_read_config(dev, SK_PCI_CAPID, 4) & 0x000000FF;
1204 if (command == 0x01) {
1205

--- 1031 unchanged lines hidden ---
1198 SK_LOCK(sc);
1199
1200 /*
1201 * Handle power management nonsense.
1202 */
1203 command = pci_read_config(dev, SK_PCI_CAPID, 4) & 0x000000FF;
1204 if (command == 0x01) {
1205

--- 1031 unchanged lines hidden ---