Deleted Added
full compact
if_an_pccard.c (67094) if_an_pccard.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_pccard.c 67094 2000-10-13 21:58:36Z wpaul $
32 * $FreeBSD: head/sys/dev/an/if_an_pccard.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

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

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
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

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

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
67#ifndef lint
68static const char rcsid[] =
69 "$FreeBSD: head/sys/dev/an/if_an_pccard.c 67096 2000-10-13 22:04:20Z wpaul $";
70#endif
71
67#include <dev/an/if_aironet_ieee.h>
68#include <dev/an/if_anreg.h>
69
70/*
71 * Support for PCMCIA cards.
72 */
73static int an_pccard_probe(device_t);
74static int an_pccard_attach(device_t);

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

144 if (error) {
145 printf("setup intr failed %d \n", error);
146 an_release_resources(dev);
147 return (error);
148 }
149
150 sc->an_bhandle = rman_get_bushandle(sc->port_res);
151 sc->an_btag = rman_get_bustag(sc->port_res);
72#include <dev/an/if_aironet_ieee.h>
73#include <dev/an/if_anreg.h>
74
75/*
76 * Support for PCMCIA cards.
77 */
78static int an_pccard_probe(device_t);
79static int an_pccard_attach(device_t);

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

149 if (error) {
150 printf("setup intr failed %d \n", error);
151 an_release_resources(dev);
152 return (error);
153 }
154
155 sc->an_bhandle = rman_get_bushandle(sc->port_res);
156 sc->an_btag = rman_get_bustag(sc->port_res);
157 sc->an_dev = dev;
152
153 error = an_attach(sc, device_get_unit(dev), flags);
154 return (error);
155}
156
158
159 error = an_attach(sc, device_get_unit(dev), flags);
160 return (error);
161}
162