Deleted Added
full compact
if_an_pci.c (67365) if_an_pci.c (77217)
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/dev/an/if_an_pci.c 67365 2000-10-20 07:58:15Z jhb $
32 * $FreeBSD: head/sys/dev/an/if_an_pci.c 77217 2001-05-26 09:27:08Z phk $
33 */
34
35/*
36 * This is a PCI shim for the Aironet PC4500/4800 wireless network
37 * driver. Aironet makes PCMCIA, ISA and PCI versions of these devices,
38 * which all have basically the same interface. The ISA and PCI cards
39 * are actually bridge adapters with PCMCIA cards inserted into them,
40 * however they appear as normal PCI or ISA devices to the host.

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

71#include <sys/rman.h>
72#include <sys/mutex.h>
73#include <machine/resource.h>
74
75#include <net/if.h>
76#include <net/if_arp.h>
77#include <net/ethernet.h>
78#include <net/if_dl.h>
33 */
34
35/*
36 * This is a PCI shim for the Aironet PC4500/4800 wireless network
37 * driver. Aironet makes PCMCIA, ISA and PCI versions of these devices,
38 * which all have basically the same interface. The ISA and PCI cards
39 * are actually bridge adapters with PCMCIA cards inserted into them,
40 * however they appear as normal PCI or ISA devices to the host.

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

71#include <sys/rman.h>
72#include <sys/mutex.h>
73#include <machine/resource.h>
74
75#include <net/if.h>
76#include <net/if_arp.h>
77#include <net/ethernet.h>
78#include <net/if_dl.h>
79#include <net/if_media.h>
79
80#include <pci/pcireg.h>
81#include <pci/pcivar.h>
82
83#ifndef lint
84static const char rcsid[] =
80
81#include <pci/pcireg.h>
82#include <pci/pcivar.h>
83
84#ifndef lint
85static const char rcsid[] =
85 "$FreeBSD: head/sys/dev/an/if_an_pci.c 67365 2000-10-20 07:58:15Z jhb $";
86 "$FreeBSD: head/sys/dev/an/if_an_pci.c 77217 2001-05-26 09:27:08Z phk $";
86#endif
87
88#include <dev/an/if_aironet_ieee.h>
89#include <dev/an/if_anreg.h>
90
91struct an_type {
92 u_int16_t an_vid;
93 u_int16_t an_did;

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

190
191static int
192an_detach_pci(device_t dev)
193{
194 struct an_softc *sc = device_get_softc(dev);
195 struct ifnet *ifp = &sc->arpcom.ac_if;
196
197 an_stop(sc);
87#endif
88
89#include <dev/an/if_aironet_ieee.h>
90#include <dev/an/if_anreg.h>
91
92struct an_type {
93 u_int16_t an_vid;
94 u_int16_t an_did;

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

191
192static int
193an_detach_pci(device_t dev)
194{
195 struct an_softc *sc = device_get_softc(dev);
196 struct ifnet *ifp = &sc->arpcom.ac_if;
197
198 an_stop(sc);
199 ifmedia_removeall(&sc->an_ifmedia);
198 ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
199 bus_teardown_intr(dev, sc->irq_res, sc->irq_handle);
200 an_release_resources(dev);
201
202 return (0);
203}
204
205static device_method_t an_pci_methods[] = {

--- 17 unchanged lines hidden ---
200 ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
201 bus_teardown_intr(dev, sc->irq_res, sc->irq_handle);
202 an_release_resources(dev);
203
204 return (0);
205}
206
207static device_method_t an_pci_methods[] = {

--- 17 unchanged lines hidden ---