Deleted Added
full compact
if_an_isa.c (67096) if_an_isa.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_isa.c 67096 2000-10-13 22:04:20Z wpaul $
32 * $FreeBSD: head/sys/dev/an/if_an_isa.c 77217 2001-05-26 09:27:08Z phk $
33 */
34
35/*
36 * Aironet 4500/4800 802.11 PCMCIA/ISA/PCI driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

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

58#include <sys/rman.h>
59#include <machine/resource.h>
60
61#include <net/if.h>
62#include <net/if_arp.h>
63#include <net/ethernet.h>
64#include <net/if_dl.h>
65#include <net/if_types.h>
33 */
34
35/*
36 * Aironet 4500/4800 802.11 PCMCIA/ISA/PCI driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

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

58#include <sys/rman.h>
59#include <machine/resource.h>
60
61#include <net/if.h>
62#include <net/if_arp.h>
63#include <net/ethernet.h>
64#include <net/if_dl.h>
65#include <net/if_types.h>
66#include <net/if_media.h>
66
67#include <isa/isavar.h>
68#include <isa/pnpvar.h>
69
70#include <dev/an/if_aironet_ieee.h>
71#include <dev/an/if_anreg.h>
72
73#ifndef lint
74static const char rcsid[] =
67
68#include <isa/isavar.h>
69#include <isa/pnpvar.h>
70
71#include <dev/an/if_aironet_ieee.h>
72#include <dev/an/if_anreg.h>
73
74#ifndef lint
75static const char rcsid[] =
75 "$FreeBSD: head/sys/dev/an/if_an_isa.c 67096 2000-10-13 22:04:20Z wpaul $";
76 "$FreeBSD: head/sys/dev/an/if_an_isa.c 77217 2001-05-26 09:27:08Z phk $";
76#endif
77
78static struct isa_pnp_id an_ids[] = {
79 { 0x0100ec06, "Aironet ISA4500/ISA4800" },
80 { 0, NULL }
81};
82
83static int an_probe_isa __P((device_t));

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

132
133static int
134an_detach_isa(device_t dev)
135{
136 struct an_softc *sc = device_get_softc(dev);
137 struct ifnet *ifp = &sc->arpcom.ac_if;
138
139 an_stop(sc);
77#endif
78
79static struct isa_pnp_id an_ids[] = {
80 { 0x0100ec06, "Aironet ISA4500/ISA4800" },
81 { 0, NULL }
82};
83
84static int an_probe_isa __P((device_t));

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

133
134static int
135an_detach_isa(device_t dev)
136{
137 struct an_softc *sc = device_get_softc(dev);
138 struct ifnet *ifp = &sc->arpcom.ac_if;
139
140 an_stop(sc);
141 ifmedia_removeall(&sc->an_ifmedia);
140 ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
141 bus_teardown_intr(dev, sc->irq_res, sc->irq_handle);
142 an_release_resources(dev);
143
144 return (0);
145}
146
147static device_method_t an_isa_methods[] = {

--- 17 unchanged lines hidden ---
142 ether_ifdetach(ifp, ETHER_BPF_SUPPORTED);
143 bus_teardown_intr(dev, sc->irq_res, sc->irq_handle);
144 an_release_resources(dev);
145
146 return (0);
147}
148
149static device_method_t an_isa_methods[] = {

--- 17 unchanged lines hidden ---