Deleted Added
full compact
if_xl.c (112872) if_xl.c (112880)
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

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

96 * support the PCI "boomerang" chips even though they work with the
97 * "vortex" driver in order to obtain better performance.
98 *
99 * This driver is in the /sys/pci directory because it only supports
100 * PCI-based NICs.
101 */
102
103#include <sys/cdefs.h>
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

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

96 * support the PCI "boomerang" chips even though they work with the
97 * "vortex" driver in order to obtain better performance.
98 *
99 * This driver is in the /sys/pci directory because it only supports
100 * PCI-based NICs.
101 */
102
103#include <sys/cdefs.h>
104__FBSDID("$FreeBSD: head/sys/pci/if_xl.c 112872 2003-03-31 17:29:43Z njl $");
104__FBSDID("$FreeBSD: head/sys/pci/if_xl.c 112880 2003-03-31 20:22:00Z jhb $");
105
106#include <sys/param.h>
107#include <sys/systm.h>
108#include <sys/sockio.h>
109#include <sys/endian.h>
110#include <sys/mbuf.h>
111#include <sys/kernel.h>
112#include <sys/socket.h>

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

1735xl_detach(dev)
1736 device_t dev;
1737{
1738 struct xl_softc *sc;
1739 struct ifnet *ifp;
1740 int rid, res;
1741
1742 sc = device_get_softc(dev);
105
106#include <sys/param.h>
107#include <sys/systm.h>
108#include <sys/sockio.h>
109#include <sys/endian.h>
110#include <sys/mbuf.h>
111#include <sys/kernel.h>
112#include <sys/socket.h>

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

1735xl_detach(dev)
1736 device_t dev;
1737{
1738 struct xl_softc *sc;
1739 struct ifnet *ifp;
1740 int rid, res;
1741
1742 sc = device_get_softc(dev);
1743 KASSERT(mtx_initialized(&sc->xl_mtx), "xl mutex not initialized");
1743 KASSERT(mtx_initialized(&sc->xl_mtx), ("xl mutex not initialized"));
1744 XL_LOCK(sc);
1745 ifp = &sc->arpcom.ac_if;
1746
1747 if (sc->xl_flags & XL_FLAG_USE_MMIO) {
1748 rid = XL_PCI_LOMEM;
1749 res = SYS_RES_MEMORY;
1750 } else {
1751 rid = XL_PCI_LOIO;

--- 1499 unchanged lines hidden ---
1744 XL_LOCK(sc);
1745 ifp = &sc->arpcom.ac_if;
1746
1747 if (sc->xl_flags & XL_FLAG_USE_MMIO) {
1748 rid = XL_PCI_LOMEM;
1749 res = SYS_RES_MEMORY;
1750 } else {
1751 rid = XL_PCI_LOIO;

--- 1499 unchanged lines hidden ---