Deleted Added
full compact
if_vr.c (78508) if_vr.c (79472)
1/*
2 * Copyright (c) 1997, 1998
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
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/vr/if_vr.c 78508 2001-06-20 19:48:35Z bmilekic $
32 * $FreeBSD: head/sys/dev/vr/if_vr.c 79472 2001-07-09 17:58:42Z wpaul $
33 */
34
35/*
36 * VIA Rhine fast ethernet PCI NIC driver
37 *
38 * Supports various network adapters based on the VIA Rhine
39 * and Rhine II PCI controllers, including the D-Link DFE530TX.
40 * Datasheets are available at http://www.via.com.tw.

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

96
97MODULE_DEPEND(vr, miibus, 1, 1, 1);
98
99/* "controller miibus0" required. See GENERIC if you get errors here. */
100#include "miibus_if.h"
101
102#ifndef lint
103static const char rcsid[] =
33 */
34
35/*
36 * VIA Rhine fast ethernet PCI NIC driver
37 *
38 * Supports various network adapters based on the VIA Rhine
39 * and Rhine II PCI controllers, including the D-Link DFE530TX.
40 * Datasheets are available at http://www.via.com.tw.

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

96
97MODULE_DEPEND(vr, miibus, 1, 1, 1);
98
99/* "controller miibus0" required. See GENERIC if you get errors here. */
100#include "miibus_if.h"
101
102#ifndef lint
103static const char rcsid[] =
104 "$FreeBSD: head/sys/dev/vr/if_vr.c 78508 2001-06-20 19:48:35Z bmilekic $";
104 "$FreeBSD: head/sys/dev/vr/if_vr.c 79472 2001-07-09 17:58:42Z wpaul $";
105#endif
106
107/*
108 * Various supported device vendors/types and their names.
109 */
110static struct vr_type vr_devs[] = {
111 { VIA_VENDORID, VIA_DEVICEID_RHINE,
112 "VIA VT3043 Rhine I 10/100BaseTX" },

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

667 pci_write_config(dev, VR_PCI_LOMEM, membase, 4);
668 pci_write_config(dev, VR_PCI_INTLINE, irq, 4);
669 }
670
671 /*
672 * Map control/status registers.
673 */
674 pci_enable_busmaster(dev);
105#endif
106
107/*
108 * Various supported device vendors/types and their names.
109 */
110static struct vr_type vr_devs[] = {
111 { VIA_VENDORID, VIA_DEVICEID_RHINE,
112 "VIA VT3043 Rhine I 10/100BaseTX" },

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

667 pci_write_config(dev, VR_PCI_LOMEM, membase, 4);
668 pci_write_config(dev, VR_PCI_INTLINE, irq, 4);
669 }
670
671 /*
672 * Map control/status registers.
673 */
674 pci_enable_busmaster(dev);
675 pci_enable_io(dev, PCIM_CMD_PORTEN);
676 pci_enable_io(dev, PCIM_CMD_MEMEN);
675 pci_enable_io(dev, SYS_RES_IOPORT);
676 pci_enable_io(dev, SYS_RES_MEMORY);
677 command = pci_read_config(dev, PCIR_COMMAND, 4);
678
679#ifdef VR_USEIOSPACE
680 if (!(command & PCIM_CMD_PORTEN)) {
681 printf("vr%d: failed to enable I/O ports!\n", unit);
682 free(sc, M_DEVBUF);
683 goto fail;
684 }

--- 971 unchanged lines hidden ---
677 command = pci_read_config(dev, PCIR_COMMAND, 4);
678
679#ifdef VR_USEIOSPACE
680 if (!(command & PCIM_CMD_PORTEN)) {
681 printf("vr%d: failed to enable I/O ports!\n", unit);
682 free(sc, M_DEVBUF);
683 goto fail;
684 }

--- 971 unchanged lines hidden ---