Deleted Added
full compact
if_an_isa.c (63090) if_an_isa.c (67096)
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 63090 2000-07-13 22:54:34Z archie $
32 * $FreeBSD: head/sys/dev/an/if_an_isa.c 67096 2000-10-13 22:04:20Z wpaul $
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

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

65#include <net/if_types.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
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

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

65#include <net/if_types.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[] =
75 "$FreeBSD: head/sys/dev/an/if_an_isa.c 67096 2000-10-13 22:04:20Z wpaul $";
76#endif
77
73static struct isa_pnp_id an_ids[] = {
74 { 0x0100ec06, "Aironet ISA4500/ISA4800" },
75 { 0, NULL }
76};
77
78static int an_probe_isa __P((device_t));
79static int an_attach_isa __P((device_t));
80static int an_detach_isa __P((device_t));

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

115 an_intr, sc, &sc->irq_handle);
116 if (error) {
117 an_release_resources(dev);
118 return (error);
119 }
120
121 sc->an_bhandle = rman_get_bushandle(sc->port_res);
122 sc->an_btag = rman_get_bustag(sc->port_res);
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));
84static int an_attach_isa __P((device_t));
85static int an_detach_isa __P((device_t));

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

120 an_intr, sc, &sc->irq_handle);
121 if (error) {
122 an_release_resources(dev);
123 return (error);
124 }
125
126 sc->an_bhandle = rman_get_bushandle(sc->port_res);
127 sc->an_btag = rman_get_bustag(sc->port_res);
128 sc->an_dev = dev;
123
124 return an_attach(sc, device_get_unit(dev), flags);
125}
126
127static int
128an_detach_isa(device_t dev)
129{
130 struct an_softc *sc = device_get_softc(dev);

--- 28 unchanged lines hidden ---
129
130 return an_attach(sc, device_get_unit(dev), flags);
131}
132
133static int
134an_detach_isa(device_t dev)
135{
136 struct an_softc *sc = device_get_softc(dev);

--- 28 unchanged lines hidden ---