Deleted Added
full compact
if_ed_pccard.c (89952) if_ed_pccard.c (93626)
1/*
2 * Copyright (c) 1995, David Greenman
3 * 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

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

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
1/*
2 * Copyright (c) 1995, David Greenman
3 * 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

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

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 * $FreeBSD: head/sys/dev/ed/if_ed_pccard.c 89952 2002-01-29 07:08:56Z imp $
27 * $FreeBSD: head/sys/dev/ed/if_ed_pccard.c 93626 2002-04-02 05:52:52Z imp $
28 */
29
30#include "opt_ed.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/socket.h>
35#include <sys/kernel.h>

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

154 { PCMCIA_CARD(ZONET, ZEN, 0),
155 -1, { 0x00, 0x80, 0xad } },
156
157 /*
158 * You have to add new entries which contains
159 * PCMCIA_VENDOR_INVALID and/or PCMCIA_PRODUCT_INVALID
160 * in front of this comment.
161 */
28 */
29
30#include "opt_ed.h"
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/socket.h>
35#include <sys/kernel.h>

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

154 { PCMCIA_CARD(ZONET, ZEN, 0),
155 -1, { 0x00, 0x80, 0xad } },
156
157 /*
158 * You have to add new entries which contains
159 * PCMCIA_VENDOR_INVALID and/or PCMCIA_PRODUCT_INVALID
160 * in front of this comment.
161 */
162 { PCMCIA_CARD(LANTECH, FASTNETTX, 0),
163 -1, { 0x00, 0x04, 0x1c}, NE2000DVF_AX88190 },
162 { PCMCIA_CARD(IBM, INFOMOVER, 0),
163 0x0ff0, { 0x08, 0x00, 0x5a } },
164 { PCMCIA_CARD(IBM, INFOMOVER, 0),
165 0x0ff0, { 0x00, 0x04, 0xac } },
166 { PCMCIA_CARD(IBM, INFOMOVER, 0),
167 0x0ff0, { 0x00, 0x06, 0x29 } },
168 { PCMCIA_CARD(KINGSTON, KNE2, 0),
169 -1, { 0, 0, 0 }, 0 }, /* XXX */
170 { PCMCIA_CARD(LINKSYS, ECARD_1, 0),
171 -1, { 0x00, 0x80, 0xc8 } },
164 { PCMCIA_CARD(IBM, INFOMOVER, 0),
165 0x0ff0, { 0x08, 0x00, 0x5a } },
166 { PCMCIA_CARD(IBM, INFOMOVER, 0),
167 0x0ff0, { 0x00, 0x04, 0xac } },
168 { PCMCIA_CARD(IBM, INFOMOVER, 0),
169 0x0ff0, { 0x00, 0x06, 0x29 } },
170 { PCMCIA_CARD(KINGSTON, KNE2, 0),
171 -1, { 0, 0, 0 }, 0 }, /* XXX */
172 { PCMCIA_CARD(LINKSYS, ECARD_1, 0),
173 -1, { 0x00, 0x80, 0xc8 } },
174 { PCMCIA_CARD(LINKSYS, PCM100, 0),
175 -1, { 0x00, 0x04, 0x5a } },
172#ifdef BOGUS
176#ifdef BOGUS
177 /*
178 * The next three should be detected as linksys, but might fail
179 * the mac sanity check.
180 */
173 { PCMCIA_CARD(PLANEX, FNW3600T, 0),
174 -1, { 0x00, 0x90, 0xcc }, NE2000DVF_DL10019 },
175 { PCMCIA_CARD(PLANEX, FNW3700T, 0),
176 -1, { 0x00, 0x90, 0xcc }, NE2000DVF_DL10019 },
181 { PCMCIA_CARD(PLANEX, FNW3600T, 0),
182 -1, { 0x00, 0x90, 0xcc }, NE2000DVF_DL10019 },
183 { PCMCIA_CARD(PLANEX, FNW3700T, 0),
184 -1, { 0x00, 0x90, 0xcc }, NE2000DVF_DL10019 },
177#endif
178 { PCMCIA_CARD(SVEC, PN650TX, 0),
179 -1, { 0x00, 0xe0, 0x98 }, NE2000DVF_DL10019 },
185 { PCMCIA_CARD(SVEC, PN650TX, 0),
186 -1, { 0x00, 0xe0, 0x98 }, NE2000DVF_DL10019 },
187#endif
180
181 /*
182 * This entry should be here so that above two cards doesn't
183 * match with this. FNW-3700T won't match above entries due to
184 * MAC address check.
185 */
186 { PCMCIA_CARD(LINKSYS, COMBO_ECARD, 0),
187 -1, { 0x00, 0x90, 0xcc }, NE2000DVF_AX88190 },

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

284 { PCMCIA_CARD(NDC, ND5100_E, 0),
285 -1, { 0x00, 0x80, 0xc6 } },
286 { PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100, 0),
287 -1, { 0x00, 0x40, 0x26 }, NE2000DVF_AX88190 },
288 { PCMCIA_CARD(MACNICA, ME1_JEIDA, 0),
289 0x00b8, { 0x08, 0x00, 0x42 } },
290 { PCMCIA_CARD(ALLIEDTELESIS, LA_PCM, 0),
291 0x0ff0, { 0x00, 0x00, 0xf4 } },
188
189 /*
190 * This entry should be here so that above two cards doesn't
191 * match with this. FNW-3700T won't match above entries due to
192 * MAC address check.
193 */
194 { PCMCIA_CARD(LINKSYS, COMBO_ECARD, 0),
195 -1, { 0x00, 0x90, 0xcc }, NE2000DVF_AX88190 },

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

292 { PCMCIA_CARD(NDC, ND5100_E, 0),
293 -1, { 0x00, 0x80, 0xc6 } },
294 { PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100, 0),
295 -1, { 0x00, 0x40, 0x26 }, NE2000DVF_AX88190 },
296 { PCMCIA_CARD(MACNICA, ME1_JEIDA, 0),
297 0x00b8, { 0x08, 0x00, 0x42 } },
298 { PCMCIA_CARD(ALLIEDTELESIS, LA_PCM, 0),
299 0x0ff0, { 0x00, 0x00, 0xf4 } },
300 { PCMCIA_CARD(NETGEAR, FA410TXC, 0),
301 -1, { 0x00, 0x48, 0x54 } },
302 { PCMCIA_CARD(NETGEAR, FA411, 0),
303 -1, { 0x00, 0x40, 0xf4 } },
304
292#if 0
293 /* the rest of these are stolen from the linux pcnet pcmcia device
294 driver. Since I don't know the manfid or cis info strings for
295 any of them, they're not compiled in until I do. */
296 { "APEX MultiCard",
297 0x0000, 0x0000, NULL, NULL, 0,
298 0x03f4, { 0x00, 0x20, 0xe5 } },
299 { "ASANTE FriendlyNet",

--- 416 unchanged lines hidden ---
305#if 0
306 /* the rest of these are stolen from the linux pcnet pcmcia device
307 driver. Since I don't know the manfid or cis info strings for
308 any of them, they're not compiled in until I do. */
309 { "APEX MultiCard",
310 0x0000, 0x0000, NULL, NULL, 0,
311 0x03f4, { 0x00, 0x20, 0xe5 } },
312 { "ASANTE FriendlyNet",

--- 416 unchanged lines hidden ---