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

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

77#include <net/ethernet.h>
78#include <net/if_dl.h>
79
80#include <pci/pcireg.h>
81#include <pci/pcivar.h>
82
83#ifndef lint
84static const char rcsid[] =
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.

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

77#include <net/ethernet.h>
78#include <net/if_dl.h>
79
80#include <pci/pcireg.h>
81#include <pci/pcivar.h>
82
83#ifndef lint
84static const char rcsid[] =
85 "$FreeBSD: head/sys/dev/an/if_an_pci.c 67094 2000-10-13 21:58:36Z wpaul $";
85 "$FreeBSD: head/sys/dev/an/if_an_pci.c 67096 2000-10-13 22:04:20Z wpaul $";
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;

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

176
177 error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET,
178 an_intr, sc, &sc->irq_handle);
179 if (error) {
180 an_release_resources(dev);
181 goto fail;
182 }
183
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;

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

176
177 error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET,
178 an_intr, sc, &sc->irq_handle);
179 if (error) {
180 an_release_resources(dev);
181 goto fail;
182 }
183
184 sc->an_dev = dev;
184 error = an_attach(sc, device_get_unit(dev), flags);
185
186fail:
187 return(error);
188}
189
190static int
191an_detach_pci(device_t dev)

--- 30 unchanged lines hidden ---
185 error = an_attach(sc, device_get_unit(dev), flags);
186
187fail:
188 return(error);
189}
190
191static int
192an_detach_pci(device_t dev)

--- 30 unchanged lines hidden ---