Deleted Added
full compact
if_ed_pccard.c (147256) if_ed_pccard.c (147580)
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 147256 2005-06-10 16:49:24Z brooks $
27 * $FreeBSD: head/sys/dev/ed/if_ed_pccard.c 147580 2005-06-24 14:36:54Z 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>

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

102static const struct ed_product {
103 struct pccard_product prod;
104 int flags;
105#define NE2000DVF_DL100XX 0x0001 /* chip is D-Link DL10019/22 */
106#define NE2000DVF_AX88X90 0x0002 /* chip is ASIX AX88[17]90 */
107#define NE2000DVF_ENADDR 0x0004 /* Get MAC from attr mem */
108 int enoff;
109} ed_pccard_products[] = {
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>

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

102static const struct ed_product {
103 struct pccard_product prod;
104 int flags;
105#define NE2000DVF_DL100XX 0x0001 /* chip is D-Link DL10019/22 */
106#define NE2000DVF_AX88X90 0x0002 /* chip is ASIX AX88[17]90 */
107#define NE2000DVF_ENADDR 0x0004 /* Get MAC from attr mem */
108 int enoff;
109} ed_pccard_products[] = {
110 { PCMCIA_CARD(ACCTON, EN2212, 0), 0},
111 { PCMCIA_CARD(ACCTON, EN2216, 0), 0},
112 { PCMCIA_CARD(ALLIEDTELESIS, LA_PCM, 0), 0},
113 { PCMCIA_CARD(AMBICOM, AMB8002T, 0), 0},
114 { PCMCIA_CARD(BILLIONTON, LNT10TN, 0), 0},
115 { PCMCIA_CARD(BILLIONTON, CFLT10N, 0), 0},
116 { PCMCIA_CARD(BUFFALO, LPC3_CLT, 0), 0},
117 { PCMCIA_CARD(BUFFALO, LPC3_CLX, 0), NE2000DVF_AX88X90},
118 { PCMCIA_CARD(BUFFALO, LPC_CF_CLT, 0), 0},
119 { PCMCIA_CARD(CNET, NE2000, 0), 0},
120 { PCMCIA_CARD(COMPEX, LINKPORT_ENET_B, 0), 0},
121 { PCMCIA_CARD(COREGA, ETHER_II_PCC_T, 0), 0},
122 { PCMCIA_CARD(COREGA, ETHER_II_PCC_TD, 0), 0},
123 { PCMCIA_CARD(COREGA, ETHER_PCC_T, 0), 0},
124 { PCMCIA_CARD(COREGA, ETHER_PCC_TD, 0), 0},
125 { PCMCIA_CARD(COREGA, FAST_ETHER_PCC_TX, 0), NE2000DVF_DL100XX },
126 { PCMCIA_CARD(COREGA, FETHER_PCC_TXD, 0), NE2000DVF_AX88X90 },
127 { PCMCIA_CARD(COREGA, FETHER_PCC_TXF, 0), NE2000DVF_DL100XX },
128 { PCMCIA_CARD(DAYNA, COMMUNICARD_E_1, 0), 0},
129 { PCMCIA_CARD(DAYNA, COMMUNICARD_E_2, 0), 0},
130 { PCMCIA_CARD(DLINK, DE650, 0), 0},
131 { PCMCIA_CARD(DLINK, DE660, 0), 0 },
132 { PCMCIA_CARD(DLINK, DE660PLUS, 0), 0},
133 { PCMCIA_CARD(DLINK, DFE670TXD, 0), NE2000DVF_DL100XX },
134 { PCMCIA_CARD(DYNALINK, L10C, 0), 0},
135 { PCMCIA_CARD(EDIMAX, EP4000A, 0), 0},
136 { PCMCIA_CARD(EPSON, EEN10B, 0), 0},
137 { PCMCIA_CARD(EXP, THINLANCOMBO, 0), 0},
138 { PCMCIA_CARD(GREY_CELL, DMF650TX, 0), 0},
139 { PCMCIA_CARD(IBM, HOME_AND_AWAY, 0), 0},
140 { PCMCIA_CARD(IBM, INFOMOVER, 0), NE2000DVF_ENADDR, 0xff0},
141 { PCMCIA_CARD(IODATA3, PCLAT, 0), 0},
142 { PCMCIA_CARD(KINGSTON, KNE2, 0), 0},
143 { PCMCIA_CARD(LANTECH, FASTNETTX, 0),NE2000DVF_AX88X90 },
144 { PCMCIA_CARD(LINKSYS, COMBO_ECARD, 0),
110 { PCMCIA_CARD(ACCTON, EN2212), 0},
111 { PCMCIA_CARD(ACCTON, EN2216), 0},
112 { PCMCIA_CARD(ALLIEDTELESIS, LA_PCM), 0},
113 { PCMCIA_CARD(AMBICOM, AMB8002T), 0},
114 { PCMCIA_CARD(BILLIONTON, LNT10TN), 0},
115 { PCMCIA_CARD(BILLIONTON, CFLT10N), 0},
116 { PCMCIA_CARD(BUFFALO, LPC3_CLT), 0},
117 { PCMCIA_CARD(BUFFALO, LPC3_CLX), NE2000DVF_AX88X90},
118 { PCMCIA_CARD(BUFFALO, LPC_CF_CLT), 0},
119 { PCMCIA_CARD(CNET, NE2000), 0},
120 { PCMCIA_CARD(COMPEX, LINKPORT_ENET_B), 0},
121 { PCMCIA_CARD(COREGA, ETHER_II_PCC_T), 0},
122 { PCMCIA_CARD(COREGA, ETHER_II_PCC_TD), 0},
123 { PCMCIA_CARD(COREGA, ETHER_PCC_T), 0},
124 { PCMCIA_CARD(COREGA, ETHER_PCC_TD), 0},
125 { PCMCIA_CARD(COREGA, FAST_ETHER_PCC_TX), NE2000DVF_DL100XX },
126 { PCMCIA_CARD(COREGA, FETHER_PCC_TXD), NE2000DVF_AX88X90 },
127 { PCMCIA_CARD(COREGA, FETHER_PCC_TXF), NE2000DVF_DL100XX },
128 { PCMCIA_CARD(DAYNA, COMMUNICARD_E_1), 0},
129 { PCMCIA_CARD(DAYNA, COMMUNICARD_E_2), 0},
130 { PCMCIA_CARD(DLINK, DE650), 0},
131 { PCMCIA_CARD(DLINK, DE660), 0 },
132 { PCMCIA_CARD(DLINK, DE660PLUS), 0},
133 { PCMCIA_CARD(DLINK, DFE670TXD), NE2000DVF_DL100XX },
134 { PCMCIA_CARD(DYNALINK, L10C), 0},
135 { PCMCIA_CARD(EDIMAX, EP4000A), 0},
136 { PCMCIA_CARD(EPSON, EEN10B), 0},
137 { PCMCIA_CARD(EXP, THINLANCOMBO), 0},
138 { PCMCIA_CARD(GREY_CELL, DMF650TX), 0},
139 { PCMCIA_CARD(IBM, HOME_AND_AWAY), 0},
140 { PCMCIA_CARD(IBM, INFOMOVER), NE2000DVF_ENADDR, 0xff0},
141 { PCMCIA_CARD(IODATA3, PCLAT), 0},
142 { PCMCIA_CARD(KINGSTON, KNE2), 0},
143 { PCMCIA_CARD(LANTECH, FASTNETTX),NE2000DVF_AX88X90 },
144 { PCMCIA_CARD(LINKSYS, COMBO_ECARD),
145 NE2000DVF_DL100XX | NE2000DVF_AX88X90 },
145 NE2000DVF_DL100XX | NE2000DVF_AX88X90 },
146 { PCMCIA_CARD(LINKSYS, ECARD_1, 0), 0},
147 { PCMCIA_CARD(LINKSYS, ECARD_2, 0), 0},
148 { PCMCIA_CARD(LINKSYS, ETHERFAST, 0), NE2000DVF_DL100XX },
149 { PCMCIA_CARD(LINKSYS, TRUST_COMBO_ECARD, 0), 0},
150 { PCMCIA_CARD(MACNICA, ME1_JEIDA, 0), 0},
151 { PCMCIA_CARD(MAGICRAM, ETHER, 0), 0},
152 { PCMCIA_CARD(MELCO, LPC3_CLX, 0), NE2000DVF_AX88X90 },
153 { PCMCIA_CARD(MELCO, LPC3_TX, 0), NE2000DVF_AX88X90 },
154 { PCMCIA_CARD(NDC, ND5100_E, 0), 0},
155 { PCMCIA_CARD(NETGEAR, FA410TXC, 0), NE2000DVF_DL100XX},
156 { PCMCIA_CARD(NETGEAR, FA411, 0), NE2000DVF_AX88X90},
157 { PCMCIA_CARD(NEXTCOM, NEXTHAWK, 0), 0},
158 { PCMCIA_CARD(OEM2, ETHERNET, 0), 0},
159 { PCMCIA_CARD(PLANET, SMARTCOM2000, 0), 0 },
160 { PCMCIA_CARD(PREMAX, PE200, 0), 0},
161 { PCMCIA_CARD(RACORE, ETHERNET, 0), 0},
162 { PCMCIA_CARD(RACORE, FASTENET, 0), NE2000DVF_AX88X90},
163 { PCMCIA_CARD(RPTI, EP400, 0), 0},
164 { PCMCIA_CARD(RPTI, EP401, 0), 0},
165 { PCMCIA_CARD(SMC, EZCARD, 0), 0},
166 { PCMCIA_CARD(SOCKET, EA_ETHER, 0), 0},
167 { PCMCIA_CARD(SOCKET, LP_ETHER, 0), 0},
168 { PCMCIA_CARD(SOCKET, LP_ETHER_CF, 0), 0},
169 { PCMCIA_CARD(SOCKET, LP_ETH_10_100_CF, 0), NE2000DVF_DL100XX},
170 { PCMCIA_CARD(SVEC, COMBOCARD, 0), 0},
171 { PCMCIA_CARD(SVEC, LANCARD, 0), 0},
172 { PCMCIA_CARD(TAMARACK, ETHERNET, 0), 0},
173 { PCMCIA_CARD(TDK, LAK_CD031, 0), 0},
174 { PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100, 0), NE2000DVF_AX88X90 },
175 { PCMCIA_CARD(XIRCOM, CFE_10, 0), 0},
176 { PCMCIA_CARD(ZONET, ZEN, 0), 0},
146 { PCMCIA_CARD(LINKSYS, ECARD_1), 0},
147 { PCMCIA_CARD(LINKSYS, ECARD_2), 0},
148 { PCMCIA_CARD(LINKSYS, ETHERFAST), NE2000DVF_DL100XX },
149 { PCMCIA_CARD(LINKSYS, TRUST_COMBO_ECARD), 0},
150 { PCMCIA_CARD(MACNICA, ME1_JEIDA), 0},
151 { PCMCIA_CARD(MAGICRAM, ETHER), 0},
152 { PCMCIA_CARD(MELCO, LPC3_CLX), NE2000DVF_AX88X90 },
153 { PCMCIA_CARD(MELCO, LPC3_TX), NE2000DVF_AX88X90 },
154 { PCMCIA_CARD(NDC, ND5100_E), 0},
155 { PCMCIA_CARD(NETGEAR, FA410TXC), NE2000DVF_DL100XX},
156 { PCMCIA_CARD(NETGEAR, FA411), NE2000DVF_AX88X90},
157 { PCMCIA_CARD(NEXTCOM, NEXTHAWK), 0},
158 { PCMCIA_CARD(OEM2, ETHERNET), 0},
159 { PCMCIA_CARD(PLANET, SMARTCOM2000), 0 },
160 { PCMCIA_CARD(PREMAX, PE200), 0},
161 { PCMCIA_CARD(RACORE, ETHERNET), 0},
162 { PCMCIA_CARD(RACORE, FASTENET), NE2000DVF_AX88X90},
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, 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},
173 { PCMCIA_CARD(TDK, LAK_CD031), 0},
174 { PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100), NE2000DVF_AX88X90 },
175 { PCMCIA_CARD(XIRCOM, CFE_10), 0},
176 { PCMCIA_CARD(ZONET, ZEN), 0},
177 { { NULL } }
178};
179
180static int
181ed_pccard_match(device_t dev)
182{
183 const struct ed_product *pp;
184 int error;

--- 461 unchanged lines hidden ---
177 { { NULL } }
178};
179
180static int
181ed_pccard_match(device_t dev)
182{
183 const struct ed_product *pp;
184 int error;

--- 461 unchanged lines hidden ---