diff options
author | imp <imp@FreeBSD.org> | 2005-03-01 07:50:12 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2005-03-01 07:50:12 +0000 |
commit | ca5e477ca2bce8c6983ba3d48bdec85ca0c8fd37 (patch) | |
tree | 60438a3fca2e5272601be58cd8fca3817dc8ed2d /sys/dev/vx | |
parent | bdb2a763651df2b1f12aa351f33d6d94f620e896 (diff) | |
download | FreeBSD-src-ca5e477ca2bce8c6983ba3d48bdec85ca0c8fd37.zip FreeBSD-src-ca5e477ca2bce8c6983ba3d48bdec85ca0c8fd37.tar.gz |
Use BUS_PROBE_DEFAULT in preference to 0. Also for vx, return
BUS_PROBE_LOW_PRIORITY in stead of ifdef for devices that xl and vx
both support so that xl will snarf them on up.
Diffstat (limited to 'sys/dev/vx')
-rw-r--r-- | sys/dev/vx/if_vx_pci.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c index 220da32..3afe238 100644 --- a/sys/dev/vx/if_vx_pci.c +++ b/sys/dev/vx/if_vx_pci.c @@ -94,28 +94,26 @@ vx_pci_probe(device_t dev) if (device_id == 0x590010b7ul) { device_set_desc(dev, "3COM 3C590 Etherlink III PCI"); - return (0); + return (BUS_PROBE_DEFAULT); } if (device_id == 0x595010b7ul || device_id == 0x595110b7ul || device_id == 0x595210b7ul) { device_set_desc(dev, "3COM 3C595 Etherlink III PCI"); - return (0); + return (BUS_PROBE_DEFAULT); } /* * The (Fast) Etherlink XL adapters are now supported by * the xl driver, which uses bus master DMA and is much * faster. (And which also supports the 3c905B. */ -#ifdef VORTEX_ETHERLINK_XL if (device_id == 0x900010b7ul || device_id == 0x900110b7ul) { device_set_desc(dev, "3COM 3C900 Etherlink XL PCI"); - return (0); + return (BUS_PROBE_LOW_PRIORITY); } if (device_id == 0x905010b7ul || device_id == 0x905110b7ul) { device_set_desc(dev, "3COM 3C905 Etherlink XL PCI"); - return (0); + return (BUS_PROBE_LOW_PRIORITY); } -#endif return (ENXIO); } |