Deleted Added
sdiff udiff text old ( 144185 ) new ( 147580 )
full compact
if_wi_pccard.c (144185) if_wi_pccard.c (147580)
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

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

34 * Lucent WaveLAN/IEEE 802.11 PCMCIA driver for FreeBSD.
35 *
36 * Written by Bill Paul <wpaul@ctr.columbia.edu>
37 * Electrical Engineering Department
38 * Columbia University, New York City
39 */
40
41#include <sys/cdefs.h>
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

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

34 * Lucent WaveLAN/IEEE 802.11 PCMCIA driver for FreeBSD.
35 *
36 * Written by Bill Paul <wpaul@ctr.columbia.edu>
37 * Electrical Engineering Department
38 * Columbia University, New York City
39 */
40
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: head/sys/dev/wi/if_wi_pccard.c 144185 2005-03-27 17:04:47Z imp $");
42__FBSDID("$FreeBSD: head/sys/dev/wi/if_wi_pccard.c 147580 2005-06-24 14:36:54Z imp $");
43
44#include "opt_wi.h"
45
46#include <sys/param.h>
47#include <sys/kernel.h>
48#include <sys/socket.h>
49#include <sys/systm.h>
50#include <sys/module.h>

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

59#include <net/ethernet.h>
60#include <net/if_dl.h>
61#include <net/if_media.h>
62#include <net/if_types.h>
63
64#include <net80211/ieee80211_var.h>
65#include <net80211/ieee80211_radiotap.h>
66
43
44#include "opt_wi.h"
45
46#include <sys/param.h>
47#include <sys/kernel.h>
48#include <sys/socket.h>
49#include <sys/systm.h>
50#include <sys/module.h>

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

59#include <net/ethernet.h>
60#include <net/if_dl.h>
61#include <net/if_media.h>
62#include <net/if_types.h>
63
64#include <net80211/ieee80211_var.h>
65#include <net80211/ieee80211_radiotap.h>
66
67#define PCCARD_API_LEVEL 6
67#include <dev/pccard/pccardvar.h>
68#include <dev/pccard/pccard_cis.h>
69
70#include <dev/wi/if_wavelan_ieee.h>
71#include <dev/wi/if_wireg.h>
72#include <dev/wi/if_wivar.h>
73#ifdef WI_SYMBOL_FIRMWARE
74#include <dev/wi/spectrum24t_cf.h>

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

102 wi_pccard_methods,
103 sizeof(struct wi_softc)
104};
105
106DRIVER_MODULE(wi, pccard, wi_pccard_driver, wi_devclass, 0, 0);
107MODULE_DEPEND(wi, wlan, 1, 1, 1);
108
109static const struct pccard_product wi_pccard_products[] = {
68#include <dev/pccard/pccardvar.h>
69#include <dev/pccard/pccard_cis.h>
70
71#include <dev/wi/if_wavelan_ieee.h>
72#include <dev/wi/if_wireg.h>
73#include <dev/wi/if_wivar.h>
74#ifdef WI_SYMBOL_FIRMWARE
75#include <dev/wi/spectrum24t_cf.h>

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

103 wi_pccard_methods,
104 sizeof(struct wi_softc)
105};
106
107DRIVER_MODULE(wi, pccard, wi_pccard_driver, wi_devclass, 0, 0);
108MODULE_DEPEND(wi, wlan, 1, 1, 1);
109
110static const struct pccard_product wi_pccard_products[] = {
110 PCMCIA_CARD(3COM, 3CRWE737A, 0),
111 PCMCIA_CARD(3COM, 3CRWE777A, 0),
112 PCMCIA_CARD(ACTIONTEC, PRISM, 0),
113 PCMCIA_CARD(ADDTRON, AWP100, 0),
114 PCMCIA_CARD(AIRVAST, WN_100, 0),
115 PCMCIA_CARD(ALLIEDTELESIS, WR211PCM, 0),
116 PCMCIA_CARD(ARTEM, ONAIR, 0),
117 PCMCIA_CARD(ASUS, WL100, 0),
118 PCMCIA_CARD(BAY, EMOBILITY_11B, 0),
119 PCMCIA_CARD(BROMAX, IWN, 0),
120 PCMCIA_CARD(BROMAX, IWN3, 0),
121 PCMCIA_CARD(BROMAX, WCF11, 0),
122 PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0),
123 PCMCIA_CARD(BUFFALO, WLI_PCM_S11, 0),
124 PCMCIA_CARD(COMPAQ, NC5004, 0),
125 PCMCIA_CARD(CONTEC, FX_DS110_PCC, 0),
126 PCMCIA_CARD(COREGA, WIRELESS_LAN_PCC_11, 0),
127 PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCA_11, 0),
128 PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCB_11, 0),
129 PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCL_11, 0),
130 PCMCIA_CARD(DLINK, DWL650H, 0),
131 PCMCIA_CARD(ELSA, XI300_IEEE, 0),
132 PCMCIA_CARD(ELSA, XI325_IEEE, 0),
133 PCMCIA_CARD(ELSA, XI800_IEEE, 0),
134 PCMCIA_CARD(EMTAC, WLAN, 0),
135 PCMCIA_CARD(ERICSSON, WIRELESSLAN, 0),
136 PCMCIA_CARD(GEMTEK, WLAN, 0),
137 PCMCIA_CARD(HWN, AIRWAY80211, 0),
138 PCMCIA_CARD(INTEL, PRO_WLAN_2011, 0),
139 PCMCIA_CARD(INTERSIL, ISL37100P, 0),
140 PCMCIA_CARD(INTERSIL, ISL37110P, 0),
141 PCMCIA_CARD(INTERSIL, ISL37300P, 0),
142 PCMCIA_CARD(INTERSIL2, PRISM2, 0),
143 PCMCIA_CARD(IODATA2, WCF12, 0),
144 PCMCIA_CARD(IODATA2, WNB11PCM, 0),
145 PCMCIA_CARD(FUJITSU, WL110, 0),
146 PCMCIA_CARD(LUCENT, WAVELAN_IEEE, 0),
147 PCMCIA_CARD(MICROSOFT, MN_520, 0),
148 PCMCIA_CARD(NOKIA, C020_WLAN, 0),
149 PCMCIA_CARD(NOKIA, C110_WLAN, 0),
150 PCMCIA_CARD(PLANEX, GWNS11H, 0),
151 PCMCIA_CARD(PROXIM, HARMONY, 0),
152 PCMCIA_CARD(PROXIM, RANGELANDS_8430, 0),
153 PCMCIA_CARD(SAMSUNG, SWL_2000N, 0),
154 PCMCIA_CARD(SIEMENS, SS1021, 0),
155 PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT, 0),
156 PCMCIA_CARD(SOCKET, LP_WLAN_CF, 0),
157 PCMCIA_CARD(SYMBOL, LA4100, 0),
158 PCMCIA_CARD(TDK, LAK_CD011WL, 0),
111 PCMCIA_CARD(3COM, 3CRWE737A),
112 PCMCIA_CARD(3COM, 3CRWE777A),
113 PCMCIA_CARD(ACTIONTEC, PRISM),
114 PCMCIA_CARD(ADDTRON, AWP100),
115 PCMCIA_CARD(AIRVAST, WN_100),
116 PCMCIA_CARD(ALLIEDTELESIS, WR211PCM),
117 PCMCIA_CARD(ARTEM, ONAIR),
118 PCMCIA_CARD(ASUS, WL100),
119 PCMCIA_CARD(BAY, EMOBILITY_11B),
120 PCMCIA_CARD(BROMAX, IWN),
121 PCMCIA_CARD(BROMAX, IWN3),
122 PCMCIA_CARD(BROMAX, WCF11),
123 PCMCIA_CARD(BUFFALO, WLI_CF_S11G),
124 PCMCIA_CARD(BUFFALO, WLI_PCM_S11),
125 PCMCIA_CARD(COMPAQ, NC5004),
126 PCMCIA_CARD(CONTEC, FX_DS110_PCC),
127 PCMCIA_CARD(COREGA, WIRELESS_LAN_PCC_11),
128 PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCA_11),
129 PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCB_11),
130 PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCL_11),
131 PCMCIA_CARD(DLINK, DWL650H),
132 PCMCIA_CARD(ELSA, XI300_IEEE),
133 PCMCIA_CARD(ELSA, XI325_IEEE),
134 PCMCIA_CARD(ELSA, XI800_IEEE),
135 PCMCIA_CARD(ELSA, WIFI_FLASH),
136 PCMCIA_CARD(EMTAC, WLAN),
137 PCMCIA_CARD(ERICSSON, WIRELESSLAN),
138 PCMCIA_CARD(GEMTEK, WLAN),
139 PCMCIA_CARD(HWN, AIRWAY80211),
140 PCMCIA_CARD(INTEL, PRO_WLAN_2011),
141 PCMCIA_CARD(INTERSIL, ISL37100P),
142 PCMCIA_CARD(INTERSIL, ISL37110P),
143 PCMCIA_CARD(INTERSIL, ISL37300P),
144 PCMCIA_CARD(INTERSIL2, PRISM2),
145 PCMCIA_CARD(IODATA2, WCF12),
146 PCMCIA_CARD(IODATA2, WNB11PCM),
147 PCMCIA_CARD(FUJITSU, WL110),
148 PCMCIA_CARD(LUCENT, WAVELAN_IEEE),
149 PCMCIA_CARD(MICROSOFT, MN_520),
150 PCMCIA_CARD(NOKIA, C020_WLAN),
151 PCMCIA_CARD(NOKIA, C110_WLAN),
152 PCMCIA_CARD(PLANEX, GWNS11H),
153 PCMCIA_CARD(PROXIM, HARMONY),
154 PCMCIA_CARD(PROXIM, RANGELANDS_8430),
155 PCMCIA_CARD(SAMSUNG, SWL_2000N),
156 PCMCIA_CARD(SIEMENS, SS1021),
157 PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT),
158 PCMCIA_CARD(SOCKET, LP_WLAN_CF),
159 PCMCIA_CARD(SYMBOL, LA4100),
160 PCMCIA_CARD(TDK, LAK_CD011WL),
159 { NULL }
160};
161
162static int
163wi_pccard_match(dev)
164 device_t dev;
165{
166 const struct pccard_product *pp;

--- 84 unchanged lines hidden --- 		161 { NULL }
162};
163
164static int
165wi_pccard_match(dev)
166 device_t dev;
167{
168 const struct pccard_product *pp;

--- 84 unchanged lines hidden ---