Deleted Added
full compact
if_sk.c (151242) if_sk.c (151341)
1/* $OpenBSD: if_sk.c,v 2.33 2003/08/12 05:23:06 nate Exp $ */
2
3/*-
4 * Copyright (c) 1997, 1998, 1999, 2000
5 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

43 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
44 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
45 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
46 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
47 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
48 */
49
50#include <sys/cdefs.h>
1/* $OpenBSD: if_sk.c,v 2.33 2003/08/12 05:23:06 nate Exp $ */
2
3/*-
4 * Copyright (c) 1997, 1998, 1999, 2000
5 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

43 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
44 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
45 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
46 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
47 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
48 */
49
50#include <sys/cdefs.h>
51__FBSDID("$FreeBSD: head/sys/dev/sk/if_sk.c 151242 2005-10-11 22:55:16Z yar $");
51__FBSDID("$FreeBSD: head/sys/dev/sk/if_sk.c 151341 2005-10-14 18:51:30Z jhb $");
52
53/*
54 * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
55 * the SK-984x series adapters, both single port and dual port.
56 * References:
57 * The XaQti XMAC II datasheet,
58 * http://www.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf
59 * The SysKonnect GEnesis manual, http://www.syskonnect.com

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

131MODULE_DEPEND(sk, ether, 1, 1, 1);
132MODULE_DEPEND(sk, miibus, 1, 1, 1);
133
134/* "controller miibus0" required. See GENERIC if you get errors here. */
135#include "miibus_if.h"
136
137#ifndef lint
138static const char rcsid[] =
52
53/*
54 * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports
55 * the SK-984x series adapters, both single port and dual port.
56 * References:
57 * The XaQti XMAC II datasheet,
58 * http://www.freebsd.org/~wpaul/SysKonnect/xmacii_datasheet_rev_c_9-29.pdf
59 * The SysKonnect GEnesis manual, http://www.syskonnect.com

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

131MODULE_DEPEND(sk, ether, 1, 1, 1);
132MODULE_DEPEND(sk, miibus, 1, 1, 1);
133
134/* "controller miibus0" required. See GENERIC if you get errors here. */
135#include "miibus_if.h"
136
137#ifndef lint
138static const char rcsid[] =
139 "$FreeBSD: head/sys/dev/sk/if_sk.c 151242 2005-10-11 22:55:16Z yar $";
139 "$FreeBSD: head/sys/dev/sk/if_sk.c 151341 2005-10-14 18:51:30Z jhb $";
140#endif
141
142static struct sk_type sk_devs[] = {
143 {
144 VENDORID_SK,
145 DEVICEID_SK_V1,
146 "SysKonnect Gigabit Ethernet (V1.0)"
147 },

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

1307 struct sk_softc *sc;
1308 struct sk_type *t = sk_devs;
1309
1310 sc = device_get_softc(dev);
1311
1312 while(t->sk_name != NULL) {
1313 if ((pci_get_vendor(dev) == t->sk_vid) &&
1314 (pci_get_device(dev) == t->sk_did)) {
140#endif
141
142static struct sk_type sk_devs[] = {
143 {
144 VENDORID_SK,
145 DEVICEID_SK_V1,
146 "SysKonnect Gigabit Ethernet (V1.0)"
147 },

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

1307 struct sk_softc *sc;
1308 struct sk_type *t = sk_devs;
1309
1310 sc = device_get_softc(dev);
1311
1312 while(t->sk_name != NULL) {
1313 if ((pci_get_vendor(dev) == t->sk_vid) &&
1314 (pci_get_device(dev) == t->sk_did)) {
1315 /*
1316 * Only attach to rev. 2 of the Linksys EG1032 adapter.
1317 * Rev. 3 is supported by re(4).
1318 */
1319 if ((t->sk_vid == VENDORID_LINKSYS) &&
1320 (t->sk_did == DEVICEID_LINKSYS_EG1032) &&
1321 (pci_get_subdevice(dev) !=
1322 SUBDEVICEID_LINKSYS_EG1032_REV2)) {
1323 t++;
1324 continue;
1325 }
1315 device_set_desc(dev, t->sk_name);
1316 return (BUS_PROBE_DEFAULT);
1317 }
1318 t++;
1319 }
1320
1321 return(ENXIO);
1322}

--- 1725 unchanged lines hidden ---
1326 device_set_desc(dev, t->sk_name);
1327 return (BUS_PROBE_DEFAULT);
1328 }
1329 t++;
1330 }
1331
1332 return(ENXIO);
1333}

--- 1725 unchanged lines hidden ---