Deleted Added
full compact
if_sk.c (78508) if_sk.c (79472)
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 78508 2001-06-20 19:48:35Z bmilekic $
32 * $FreeBSD: head/sys/dev/sk/if_sk.c 79472 2001-07-09 17:58:42Z wpaul $
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 78508 2001-06-20 19:48:35Z bmilekic $";
116 "$FreeBSD: head/sys/dev/sk/if_sk.c 79472 2001-07-09 17:58:42Z wpaul $";
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));

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

1212 pci_write_config(dev, SK_PCI_LOMEM, membase, 4);
1213 pci_write_config(dev, SK_PCI_INTLINE, irq, 4);
1214 }
1215
1216 /*
1217 * Map control/status registers.
1218 */
1219 pci_enable_busmaster(dev);
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));

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

1212 pci_write_config(dev, SK_PCI_LOMEM, membase, 4);
1213 pci_write_config(dev, SK_PCI_INTLINE, irq, 4);
1214 }
1215
1216 /*
1217 * Map control/status registers.
1218 */
1219 pci_enable_busmaster(dev);
1220 pci_enable_io(dev, PCIM_CMD_PORTEN);
1221 pci_enable_io(dev, PCIM_CMD_MEMEN);
1220 pci_enable_io(dev, SYS_RES_IOPORT);
1221 pci_enable_io(dev, SYS_RES_MEMORY);
1222 command = pci_read_config(dev, PCIR_COMMAND, 4);
1223
1224#ifdef SK_USEIOSPACE
1225 if (!(command & PCIM_CMD_PORTEN)) {
1226 printf("skc%d: failed to enable I/O ports!\n", unit);
1227 error = ENXIO;
1228 goto fail;
1229 }

--- 994 unchanged lines hidden ---
1222 command = pci_read_config(dev, PCIR_COMMAND, 4);
1223
1224#ifdef SK_USEIOSPACE
1225 if (!(command & PCIM_CMD_PORTEN)) {
1226 printf("skc%d: failed to enable I/O ports!\n", unit);
1227 error = ENXIO;
1228 goto fail;
1229 }

--- 994 unchanged lines hidden ---