Deleted Added
full compact
if_re.c (150968) if_re.c (151341)
1/*-
2 * Copyright (c) 1997, 1998-2003
3 * Bill Paul <wpaul@windriver.com>. 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

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

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
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1997, 1998-2003
3 * Bill Paul <wpaul@windriver.com>. 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

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

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
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/dev/re/if_re.c 150968 2005-10-05 10:09:17Z glebius $");
34__FBSDID("$FreeBSD: head/sys/dev/re/if_re.c 151341 2005-10-14 18:51:30Z jhb $");
35
36/*
37 * RealTek 8139C+/8169/8169S/8110S PCI NIC driver
38 *
39 * Written by Bill Paul <wpaul@windriver.com>
40 * Senior Networking Software Engineer
41 * Wind River Systems
42 */

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

172 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169S,
173 "RealTek 8169S Single-chip Gigabit Ethernet" },
174 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169SB,
175 "RealTek 8169SB Single-chip Gigabit Ethernet" },
176 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8110S,
177 "RealTek 8110S Single-chip Gigabit Ethernet" },
178 { COREGA_VENDORID, COREGA_DEVICEID_CGLAPCIGT, RL_HWREV_8169S,
179 "Corega CG-LAPCIGT (RTL8169S) Gigabit Ethernet" },
35
36/*
37 * RealTek 8139C+/8169/8169S/8110S PCI NIC driver
38 *
39 * Written by Bill Paul <wpaul@windriver.com>
40 * Senior Networking Software Engineer
41 * Wind River Systems
42 */

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

172 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169S,
173 "RealTek 8169S Single-chip Gigabit Ethernet" },
174 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169SB,
175 "RealTek 8169SB Single-chip Gigabit Ethernet" },
176 { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8110S,
177 "RealTek 8110S Single-chip Gigabit Ethernet" },
178 { COREGA_VENDORID, COREGA_DEVICEID_CGLAPCIGT, RL_HWREV_8169S,
179 "Corega CG-LAPCIGT (RTL8169S) Gigabit Ethernet" },
180 { LINKSYS_VENDORID, LINKSYS_DEVICEID_EG1032, RL_HWREV_8169S,
181 "Linksys EG1032 (RTL8169S) Gigabit Ethernet" },
180 { 0, 0, 0, NULL }
181};
182
183static struct rl_hwrev re_hwrevs[] = {
184 { RL_HWREV_8139, RL_8139, "" },
185 { RL_HWREV_8139A, RL_8139, "A" },
186 { RL_HWREV_8139AG, RL_8139, "A-G" },
187 { RL_HWREV_8139B, RL_8139, "B" },

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

821 u_int32_t hwrev;
822
823 t = re_devs;
824 sc = device_get_softc(dev);
825
826 while (t->rl_name != NULL) {
827 if ((pci_get_vendor(dev) == t->rl_vid) &&
828 (pci_get_device(dev) == t->rl_did)) {
182 { 0, 0, 0, NULL }
183};
184
185static struct rl_hwrev re_hwrevs[] = {
186 { RL_HWREV_8139, RL_8139, "" },
187 { RL_HWREV_8139A, RL_8139, "A" },
188 { RL_HWREV_8139AG, RL_8139, "A-G" },
189 { RL_HWREV_8139B, RL_8139, "B" },

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

823 u_int32_t hwrev;
824
825 t = re_devs;
826 sc = device_get_softc(dev);
827
828 while (t->rl_name != NULL) {
829 if ((pci_get_vendor(dev) == t->rl_vid) &&
830 (pci_get_device(dev) == t->rl_did)) {
831 /*
832 * Only attach to rev. 3 of the Linksys EG1032 adapter.
833 * Rev. 2 i supported by sk(4).
834 */
835 if ((t->rl_vid == LINKSYS_VENDORID) &&
836 (t->rl_did == LINKSYS_DEVICEID_EG1032) &&
837 (pci_get_subdevice(dev) !=
838 LINKSYS_SUBDEVICE_EG1032_REV3)) {
839 t++;
840 continue;
841 }
829
830 /*
831 * Temporarily map the I/O space
832 * so we can read the chip ID register.
833 */
834 rid = RL_RID;
835 sc->rl_res = bus_alloc_resource_any(dev, RL_RES, &rid,
836 RF_ACTIVE);

--- 1664 unchanged lines hidden ---
842
843 /*
844 * Temporarily map the I/O space
845 * so we can read the chip ID register.
846 */
847 rid = RL_RID;
848 sc->rl_res = bus_alloc_resource_any(dev, RL_RES, &rid,
849 RF_ACTIVE);

--- 1664 unchanged lines hidden ---