Deleted Added
full compact
if_ed_pccard.c (149890) if_ed_pccard.c (149922)
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 149890 2005-09-08 17:16:23Z imp $
27 * $FreeBSD: head/sys/dev/ed/if_ed_pccard.c 149922 2005-09-10 00:17:55Z 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>

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

117 { PCMCIA_CARD(COREGA, FAST_ETHER_PCC_TX), NE2000DVF_DL100XX },
118 { PCMCIA_CARD(COREGA, FETHER_PCC_TXD), NE2000DVF_AX88X90 },
119 { PCMCIA_CARD(COREGA, FETHER_PCC_TXF), NE2000DVF_DL100XX },
120 { PCMCIA_CARD(DAYNA, COMMUNICARD_E_1), 0},
121 { PCMCIA_CARD(DAYNA, COMMUNICARD_E_2), 0},
122 { PCMCIA_CARD(DLINK, DE650), 0},
123 { PCMCIA_CARD(DLINK, DE660), 0 },
124 { PCMCIA_CARD(DLINK, DE660PLUS), 0},
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>

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

117 { PCMCIA_CARD(COREGA, FAST_ETHER_PCC_TX), NE2000DVF_DL100XX },
118 { PCMCIA_CARD(COREGA, FETHER_PCC_TXD), NE2000DVF_AX88X90 },
119 { PCMCIA_CARD(COREGA, FETHER_PCC_TXF), NE2000DVF_DL100XX },
120 { PCMCIA_CARD(DAYNA, COMMUNICARD_E_1), 0},
121 { PCMCIA_CARD(DAYNA, COMMUNICARD_E_2), 0},
122 { PCMCIA_CARD(DLINK, DE650), 0},
123 { PCMCIA_CARD(DLINK, DE660), 0 },
124 { PCMCIA_CARD(DLINK, DE660PLUS), 0},
125 { PCMCIA_CARD(DLINK, DFE670TXD), NE2000DVF_DL100XX },
126 { PCMCIA_CARD(DYNALINK, L10C), 0},
127 { PCMCIA_CARD(EDIMAX, EP4000A), 0},
128 { PCMCIA_CARD(EPSON, EEN10B), 0},
129 { PCMCIA_CARD(EXP, THINLANCOMBO), 0},
130 { PCMCIA_CARD(GREY_CELL, TDK3000), 0},
131 { PCMCIA_CARD(GREY_CELL, DMF650TX),
132 NE2000DVF_ANYFUNC | NE2000DVF_DL100XX | NE2000DVF_MODEM},
133 { PCMCIA_CARD(IBM, HOME_AND_AWAY), 0},

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

143 { PCMCIA_CARD(LINKSYS, ETHERFAST), NE2000DVF_DL100XX },
144 { PCMCIA_CARD(LINKSYS, TRUST_COMBO_ECARD), 0},
145 { PCMCIA_CARD(MACNICA, ME1_JEIDA), 0},
146 { PCMCIA_CARD(MAGICRAM, ETHER), 0},
147 { PCMCIA_CARD(MELCO, LPC3_CLX), NE2000DVF_AX88X90 },
148 { PCMCIA_CARD(MELCO, LPC3_TX), NE2000DVF_AX88X90 },
149 { PCMCIA_CARD(NDC, ND5100_E), 0},
150 { PCMCIA_CARD(NETGEAR, FA410TXC), NE2000DVF_DL100XX},
125 { PCMCIA_CARD(DYNALINK, L10C), 0},
126 { PCMCIA_CARD(EDIMAX, EP4000A), 0},
127 { PCMCIA_CARD(EPSON, EEN10B), 0},
128 { PCMCIA_CARD(EXP, THINLANCOMBO), 0},
129 { PCMCIA_CARD(GREY_CELL, TDK3000), 0},
130 { PCMCIA_CARD(GREY_CELL, DMF650TX),
131 NE2000DVF_ANYFUNC | NE2000DVF_DL100XX | NE2000DVF_MODEM},
132 { PCMCIA_CARD(IBM, HOME_AND_AWAY), 0},

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

142 { PCMCIA_CARD(LINKSYS, ETHERFAST), NE2000DVF_DL100XX },
143 { PCMCIA_CARD(LINKSYS, TRUST_COMBO_ECARD), 0},
144 { PCMCIA_CARD(MACNICA, ME1_JEIDA), 0},
145 { PCMCIA_CARD(MAGICRAM, ETHER), 0},
146 { PCMCIA_CARD(MELCO, LPC3_CLX), NE2000DVF_AX88X90 },
147 { PCMCIA_CARD(MELCO, LPC3_TX), NE2000DVF_AX88X90 },
148 { PCMCIA_CARD(NDC, ND5100_E), 0},
149 { PCMCIA_CARD(NETGEAR, FA410TXC), NE2000DVF_DL100XX},
151 { PCMCIA_CARD(NETGEAR, FA411), NE2000DVF_AX88X90},
150 /* Same ID as DLINK DFE-670TXD. 670 has DL10022, fa411 has ax88790 */
151 { PCMCIA_CARD(NETGEAR, FA411), NE2000DVF_AX88X90 | NE2000DVF_DL100XX},
152 { PCMCIA_CARD(NEXTCOM, NEXTHAWK), 0},
153 { PCMCIA_CARD(NEWMEDIA, LANSURFER), 0},
154 { PCMCIA_CARD(OEM2, ETHERNET), 0},
152 { PCMCIA_CARD(NEXTCOM, NEXTHAWK), 0},
153 { PCMCIA_CARD(NEWMEDIA, LANSURFER), 0},
154 { PCMCIA_CARD(OEM2, ETHERNET), 0},
155 { PCMCIA_CARD(OEM2, NE2000), 0},
155 { PCMCIA_CARD(PLANET, SMARTCOM2000), 0 },
156 { PCMCIA_CARD(PREMAX, PE200), 0},
157 { PCMCIA_CARD(PSION, LANGLOBAL), 0},
158 { PCMCIA_CARD(RACORE, ETHERNET), 0},
159 { PCMCIA_CARD(RACORE, FASTENET), NE2000DVF_AX88X90},
160 { PCMCIA_CARD(RACORE, 8041TX), NE2000DVF_AX88X90},
161 { PCMCIA_CARD(RELIA, COMBO), 0},
162 { PCMCIA_CARD(RPTI, EP400), 0},
163 { PCMCIA_CARD(RPTI, EP401), 0},
164 { PCMCIA_CARD(SMC, EZCARD), 0},
165 { PCMCIA_CARD(SOCKET, EA_ETHER), 0},
166 { PCMCIA_CARD(SOCKET, ES_1000), 0},
167 { PCMCIA_CARD(SOCKET, LP_ETHER), 0},
168 { PCMCIA_CARD(SOCKET, LP_ETHER_CF), 0},
169 { PCMCIA_CARD(SOCKET, LP_ETH_10_100_CF), NE2000DVF_DL100XX},
170 { PCMCIA_CARD(SVEC, COMBOCARD), 0},
171 { PCMCIA_CARD(SVEC, LANCARD), 0},
172 { PCMCIA_CARD(TAMARACK, ETHERNET), 0},
156 { PCMCIA_CARD(PLANET, SMARTCOM2000), 0 },
157 { PCMCIA_CARD(PREMAX, PE200), 0},
158 { PCMCIA_CARD(PSION, LANGLOBAL), 0},
159 { PCMCIA_CARD(RACORE, ETHERNET), 0},
160 { PCMCIA_CARD(RACORE, FASTENET), NE2000DVF_AX88X90},
161 { PCMCIA_CARD(RACORE, 8041TX), NE2000DVF_AX88X90},
162 { PCMCIA_CARD(RELIA, COMBO), 0},
163 { PCMCIA_CARD(RPTI, EP400), 0},
164 { PCMCIA_CARD(RPTI, EP401), 0},
165 { PCMCIA_CARD(SMC, EZCARD), 0},
166 { PCMCIA_CARD(SOCKET, EA_ETHER), 0},
167 { PCMCIA_CARD(SOCKET, ES_1000), 0},
168 { PCMCIA_CARD(SOCKET, LP_ETHER), 0},
169 { PCMCIA_CARD(SOCKET, LP_ETHER_CF), 0},
170 { PCMCIA_CARD(SOCKET, LP_ETH_10_100_CF), NE2000DVF_DL100XX},
171 { PCMCIA_CARD(SVEC, COMBOCARD), 0},
172 { PCMCIA_CARD(SVEC, LANCARD), 0},
173 { PCMCIA_CARD(TAMARACK, ETHERNET), 0},
174 { PCMCIA_CARD(TDK, CFE_10), 0},
173 { PCMCIA_CARD(TDK, LAK_CD031), 0},
174 { PCMCIA_CARD(TDK, DFL5610WS), 0},
175 { PCMCIA_CARD(TELECOMDEVICE, LM5LT), 0 },
176 { PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100), NE2000DVF_AX88X90 },
175 { PCMCIA_CARD(TDK, LAK_CD031), 0},
176 { PCMCIA_CARD(TDK, DFL5610WS), 0},
177 { PCMCIA_CARD(TELECOMDEVICE, LM5LT), 0 },
178 { PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100), NE2000DVF_AX88X90 },
177 { PCMCIA_CARD(XIRCOM, CFE_10), 0},
178 { PCMCIA_CARD(ZONET, ZEN), 0},
179 { { NULL } }
180};
181
182/*
183 * PC Card (PCMCIA) specific code.
184 */
185static int ed_pccard_probe(device_t);

--- 510 unchanged lines hidden ---
179 { PCMCIA_CARD(ZONET, ZEN), 0},
180 { { NULL } }
181};
182
183/*
184 * PC Card (PCMCIA) specific code.
185 */
186static int ed_pccard_probe(device_t);

--- 510 unchanged lines hidden ---