Deleted Added
full compact
if_wi_pci.c (118068) if_wi_pci.c (118679)
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/wi/if_wi_pci.c 118068 2003-07-26 20:54:57Z jdp $
32 * $FreeBSD: head/sys/dev/wi/if_wi_pci.c 118679 2003-08-08 23:33:42Z marcel $
33 */
34
35/*
36 * Lucent WaveLAN/IEEE 802.11 PCMCIA driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

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

93static struct {
94 unsigned int vendor,device;
95 int bus_type;
96 char *desc;
97} pci_ids[] = {
98 /* Sorted by description */
99 {0x10b7, 0x7770, WI_BUS_PCI_PLX, "3Com Airconnect"},
100 {0x16ab, 0x1101, WI_BUS_PCI_PLX, "GLPRISM2 WaveLAN"},
33 */
34
35/*
36 * Lucent WaveLAN/IEEE 802.11 PCMCIA driver for FreeBSD.
37 *
38 * Written by Bill Paul <wpaul@ctr.columbia.edu>
39 * Electrical Engineering Department
40 * Columbia University, New York City

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

93static struct {
94 unsigned int vendor,device;
95 int bus_type;
96 char *desc;
97} pci_ids[] = {
98 /* Sorted by description */
99 {0x10b7, 0x7770, WI_BUS_PCI_PLX, "3Com Airconnect"},
100 {0x16ab, 0x1101, WI_BUS_PCI_PLX, "GLPRISM2 WaveLAN"},
101 {0x1260, 0x3872, WI_BUS_PCI_NATIVE, "Intersil Prism3"},
101 {0x1260, 0x3873, WI_BUS_PCI_NATIVE, "Intersil Prism2.5"},
102 {0x16ab, 0x1102, WI_BUS_PCI_PLX, "Linksys WDT11"},
103 {0x1385, 0x4100, WI_BUS_PCI_PLX, "Netgear MA301"},
104 {0x1638, 0x1100, WI_BUS_PCI_PLX, "PRISM2STA WaveLAN"},
105 {0x111a, 0x1023, WI_BUS_PCI_PLX, "Siemens SpeedStream"},
106 {0x10b5, 0x9050, WI_BUS_PCI_PLX, "SMC 2602W"},
107 {0x16ec, 0x3685, WI_BUS_PCI_PLX, "US Robotics 2415"},
108 {0x4033, 0x7001, WI_BUS_PCI_PLX, "Addtron AWA-100 PCI"},

--- 167 unchanged lines hidden ---
102 {0x1260, 0x3873, WI_BUS_PCI_NATIVE, "Intersil Prism2.5"},
103 {0x16ab, 0x1102, WI_BUS_PCI_PLX, "Linksys WDT11"},
104 {0x1385, 0x4100, WI_BUS_PCI_PLX, "Netgear MA301"},
105 {0x1638, 0x1100, WI_BUS_PCI_PLX, "PRISM2STA WaveLAN"},
106 {0x111a, 0x1023, WI_BUS_PCI_PLX, "Siemens SpeedStream"},
107 {0x10b5, 0x9050, WI_BUS_PCI_PLX, "SMC 2602W"},
108 {0x16ec, 0x3685, WI_BUS_PCI_PLX, "US Robotics 2415"},
109 {0x4033, 0x7001, WI_BUS_PCI_PLX, "Addtron AWA-100 PCI"},

--- 167 unchanged lines hidden ---