Deleted Added
full compact
if_vx_pci.c (139749) if_vx_pci.c (142880)
1/*-
2 * Copyright (C) 1996 Naoki Hamada <nao@tom-yam.or.jp>
3 * 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

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

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (C) 1996 Naoki Hamada <nao@tom-yam.or.jp>
3 * 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

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

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/vx/if_vx_pci.c 139749 2005-01-06 01:43:34Z imp $");
31__FBSDID("$FreeBSD: head/sys/dev/vx/if_vx_pci.c 142880 2005-03-01 07:50:12Z imp $");
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/kernel.h>
36#include <sys/module.h>
37#include <sys/socket.h>
38
39#include <net/if.h>

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

89vx_pci_probe(device_t dev)
90{
91 u_int32_t device_id;
92
93 device_id = pci_read_config(dev, PCIR_DEVVENDOR, 4);
94
95 if (device_id == 0x590010b7ul) {
96 device_set_desc(dev, "3COM 3C590 Etherlink III PCI");
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/kernel.h>
36#include <sys/module.h>
37#include <sys/socket.h>
38
39#include <net/if.h>

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

89vx_pci_probe(device_t dev)
90{
91 u_int32_t device_id;
92
93 device_id = pci_read_config(dev, PCIR_DEVVENDOR, 4);
94
95 if (device_id == 0x590010b7ul) {
96 device_set_desc(dev, "3COM 3C590 Etherlink III PCI");
97 return (0);
97 return (BUS_PROBE_DEFAULT);
98 }
99 if (device_id == 0x595010b7ul || device_id == 0x595110b7ul ||
100 device_id == 0x595210b7ul) {
101 device_set_desc(dev, "3COM 3C595 Etherlink III PCI");
98 }
99 if (device_id == 0x595010b7ul || device_id == 0x595110b7ul ||
100 device_id == 0x595210b7ul) {
101 device_set_desc(dev, "3COM 3C595 Etherlink III PCI");
102 return (0);
102 return (BUS_PROBE_DEFAULT);
103 }
104 /*
105 * The (Fast) Etherlink XL adapters are now supported by
106 * the xl driver, which uses bus master DMA and is much
107 * faster. (And which also supports the 3c905B.
108 */
103 }
104 /*
105 * The (Fast) Etherlink XL adapters are now supported by
106 * the xl driver, which uses bus master DMA and is much
107 * faster. (And which also supports the 3c905B.
108 */
109#ifdef VORTEX_ETHERLINK_XL
110 if (device_id == 0x900010b7ul || device_id == 0x900110b7ul) {
111 device_set_desc(dev, "3COM 3C900 Etherlink XL PCI");
109 if (device_id == 0x900010b7ul || device_id == 0x900110b7ul) {
110 device_set_desc(dev, "3COM 3C900 Etherlink XL PCI");
112 return (0);
111 return (BUS_PROBE_LOW_PRIORITY);
113 }
114 if (device_id == 0x905010b7ul || device_id == 0x905110b7ul) {
115 device_set_desc(dev, "3COM 3C905 Etherlink XL PCI");
112 }
113 if (device_id == 0x905010b7ul || device_id == 0x905110b7ul) {
114 device_set_desc(dev, "3COM 3C905 Etherlink XL PCI");
116 return (0);
115 return (BUS_PROBE_LOW_PRIORITY);
117 }
116 }
118#endif
119 return (ENXIO);
120}
121
122static int
123vx_pci_attach(device_t dev)
124{
125 struct vx_softc *sc;
126 int rid;

--- 50 unchanged lines hidden ---
117 return (ENXIO);
118}
119
120static int
121vx_pci_attach(device_t dev)
122{
123 struct vx_softc *sc;
124 int rid;

--- 50 unchanged lines hidden ---