Deleted Added
full compact
if_xl.c (51455) if_xl.c (51473)
1/*
2 * Copyright (c) 1997, 1998, 1999
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
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/pci/if_xl.c 51455 1999-09-20 08:47:11Z wpaul $
32 * $FreeBSD: head/sys/pci/if_xl.c 51473 1999-09-20 19:06:45Z wpaul $
33 */
34
35/*
36 * 3Com 3c90x Etherlink XL PCI NIC driver
37 *
38 * Supports the 3Com "boomerang", "cyclone" and "hurricane" PCI
39 * bus-master chips (3c90x cards and embedded controllers) including
40 * the following:

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

146 * might not work on some devices.
147 */
148#define XL_USEIOSPACE
149
150#include <pci/if_xlreg.h>
151
152#if !defined(lint)
153static const char rcsid[] =
33 */
34
35/*
36 * 3Com 3c90x Etherlink XL PCI NIC driver
37 *
38 * Supports the 3Com "boomerang", "cyclone" and "hurricane" PCI
39 * bus-master chips (3c90x cards and embedded controllers) including
40 * the following:

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

146 * might not work on some devices.
147 */
148#define XL_USEIOSPACE
149
150#include <pci/if_xlreg.h>
151
152#if !defined(lint)
153static const char rcsid[] =
154 "$FreeBSD: head/sys/pci/if_xl.c 51455 1999-09-20 08:47:11Z wpaul $";
154 "$FreeBSD: head/sys/pci/if_xl.c 51473 1999-09-20 19:06:45Z wpaul $";
155#endif
156
157/*
158 * Various supported device vendors/types and their names.
159 */
160static struct xl_type xl_devs[] = {
161 { TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT,
162 "3Com 3c900-TPO Etherlink XL" },

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

279static driver_t xl_driver = {
280 "xl",
281 xl_methods,
282 sizeof(struct xl_softc)
283};
284
285static devclass_t xl_devclass;
286
155#endif
156
157/*
158 * Various supported device vendors/types and their names.
159 */
160static struct xl_type xl_devs[] = {
161 { TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT,
162 "3Com 3c900-TPO Etherlink XL" },

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

279static driver_t xl_driver = {
280 "xl",
281 xl_methods,
282 sizeof(struct xl_softc)
283};
284
285static devclass_t xl_devclass;
286
287DRIVER_MODULE(if_xl, pci, xl_driver, xl_devclass, 0, 0);
288DRIVER_MODULE(miibus, if_xl, miibus_driver, miibus_devclass, 0, 0);
287DRIVER_MODULE(xl, pci, xl_driver, xl_devclass, 0, 0);
288DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, 0, 0);
289
290/*
291 * Murphy's law says that it's possible the chip can wedge and
292 * the 'command in progress' bit may never clear. Hence, we wait
293 * only a finite amount of time to avoid getting caught in an
294 * infinite loop. Normally this delay routine would be a macro,
295 * but it isn't called during normal operation so we can afford
296 * to make it a function.

--- 2537 unchanged lines hidden ---
289
290/*
291 * Murphy's law says that it's possible the chip can wedge and
292 * the 'command in progress' bit may never clear. Hence, we wait
293 * only a finite amount of time to avoid getting caught in an
294 * infinite loop. Normally this delay routine would be a macro,
295 * but it isn't called during normal operation so we can afford
296 * to make it a function.

--- 2537 unchanged lines hidden ---