d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate to PCMCIA_CARD() macros

Browse Source
This commit is contained in:
imp 2001-11-15 07:52:49 +00:00
parent 3e552735d1
commit 6fdb4db61f
6 changed files with 67 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/aic/aic_pccard.c
View File

@ -56,15 +56,9 @@ static int aic_pccard_probe(device_t);
static int aic_pccard_attach(device_t);
const struct pccard_product aic_pccard_products[] = {
{ PCMCIA_STR_ADAPTEC_APA1460, PCMCIA_VENDOR_ADAPTEC,
PCMCIA_PRODUCT_ADAPTEC_APA1460, 0,
PCMCIA_CIS_ADAPTEC_APA1460 },
{ PCMCIA_STR_ADAPTEC_APA1460A, PCMCIA_VENDOR_ADAPTEC,
PCMCIA_PRODUCT_ADAPTEC_APA1460A, 0,
PCMCIA_CIS_ADAPTEC_APA1460A },
{ PCMCIA_STR_NEWMEDIA_BUSTOASTER, PCMCIA_VENDOR_NEWMEDIA,
PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER, 0,
PCMCIA_CIS_NEWMEDIA_BUSTOASTER },
PCMCIA_CARD(ADAPTEC, APA1460, 0),
PCMCIA_CARD(ADAPTEC, APA1460A, 0),
PCMCIA_CARD(NEWMEDIA, BUSTOASTER, 0),
{ NULL }
};

4
sys/dev/cs/if_cs_pccard.c
View File

@ -48,9 +48,7 @@
#include "card_if.h"
static const struct pccard_product cs_pccard_products[] = {
{ PCMCIA_STR_IBM_ETHERJET, PCMCIA_VENDOR_IBM,
PCMCIA_PRODUCT_IBM_ETHERJET, 0,
PCMCIA_CIS_IBM_ETHERJET },
PCMCIA_CARD(IBM, ETHERJET, 0),
{ NULL }
};
static int

222
sys/dev/ed/if_ed_pccard.c
View File

@ -121,59 +121,27 @@ static const struct ed_product {
#define NE2000DVF_DL10019 0x0001 /* chip is D-Link DL10019 */
#define NE2000DVF_AX88190 0x0002 /* chip is ASIX AX88190 */
} ed_pccard_products[] = {
{ { PCMCIA_STR_AMBICOM_AMB8002T,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_AMBICOM_AMB8002T },
{ PCMCIA_CARD(AMBICOM, AMB8002T, 0),
-1, { 0x00, 0x10, 0x7a } },
{ { PCMCIA_STR_PREMAX_PE200,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_PREMAX_PE200 },
{ PCMCIA_CARD(PREMAX, PE200, 0),
0x07f0, { 0x00, 0x20, 0xe0 } },
{ { PCMCIA_STR_DIGITAL_DEPCMXX,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_DIGITAL_DEPCMXX },
{ PCMCIA_CARD(DIGITAL, DEPCMXX, 0),
0x0ff0, { 0x00, 0x00, 0xe8 } },
{ { PCMCIA_STR_PLANET_SMARTCOM2000,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_PLANET_SMARTCOM2000 },
{ PCMCIA_CARD(PLANET, SMARTCOM2000, 0),
0xff0, { 0x00, 0x00, 0xe8 } },
{ { PCMCIA_STR_DLINK_DE660,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_DLINK_DE660 },
{ PCMCIA_CARD(DLINK, DE660, 0),
-1, { 0x00, 0x80, 0xc8 } },
{ { PCMCIA_STR_RPTI_EP400,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_RPTI_EP400 },
{ PCMCIA_CARD(RPTI, EP400, 0),
-1, { 0x00, 0x40, 0x95 } },
{ { PCMCIA_STR_RPTI_EP401,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_RPTI_EP401 },
{ PCMCIA_CARD(RPTI, EP401, 0),
-1, { 0x00, 0x40, 0x95 } },
{ { PCMCIA_STR_ACCTON_EN2212,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_ACCTON_EN2212 },
{ PCMCIA_CARD(ACCTON, EN2212, 0),
0x0ff0, { 0x00, 0x00, 0xe8 } },
{ { PCMCIA_STR_SVEC_COMBOCARD,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_SVEC_COMBOCARD },
{ PCMCIA_CARD(SVEC, COMBOCARD, 0),
-1, { 0x00, 0xe0, 0x98 } },
{ { PCMCIA_STR_SVEC_LANCARD,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_SVEC_LANCARD },
{ PCMCIA_CARD(SVEC, LANCARD, 0),
0x7f0, { 0x00, 0xc0, 0x6c } },
{ { PCMCIA_STR_EPSON_EEN10B,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_EPSON_EEN10B, 0,
PCMCIA_CIS_EPSON_EEN10B },
{ PCMCIA_CARD(EPSON, EEN10B, 0),
0xff0, { 0x00, 0x00, 0x48 } },
/*
@ -186,40 +154,19 @@ static const struct ed_product {
* needs a table where the exceptions comes first and then the normal
* product and vendor entries.
*/
{ { PCMCIA_STR_IBM_INFOMOVER,
PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER, 0,
PCMCIA_CIS_IBM_INFOMOVER },
{ PCMCIA_CARD(IBM, INFOMOVER, 0),
0x0ff0, { 0x08, 0x00, 0x5a } },
{ { PCMCIA_STR_IBM_INFOMOVER,
PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER, 0,
PCMCIA_CIS_IBM_INFOMOVER },
{ PCMCIA_CARD(IBM, INFOMOVER, 0),
0x0ff0, { 0x00, 0x04, 0xac } },
{ { PCMCIA_STR_IBM_INFOMOVER,
PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER, 0,
PCMCIA_CIS_IBM_INFOMOVER },
{ PCMCIA_CARD(IBM, INFOMOVER, 0),
0x0ff0, { 0x00, 0x06, 0x29 } },
{ { PCMCIA_STR_KINGSTON_KNE2, PCMCIA_VENDOR_KINGSTON,
PCMCIA_PRODUCT_KINGSTON_KNE2, 0,
PCMCIA_CIS_KINGSTON_KNE2 },
-1, { 0, 0, 0 }, 0 }, /* XXX */
{ { PCMCIA_STR_LINKSYS_ECARD_1,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD_1, 0,
PCMCIA_CIS_LINKSYS_ECARD_1 },
{ PCMCIA_CARD(KINGSTON, KNE2, 0),
-1, { 0, 0, 0 }, 0 }, /* XXX */
{ PCMCIA_CARD(LINKSYS, ECARD_1, 0),
-1, { 0x00, 0x80, 0xc8 } },
{ { PCMCIA_STR_PLANEX_FNW3600T,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCMCIA_CIS_PLANEX_FNW3600T },
{ PCMCIA_CARD(PLANEX, FNW3600T, 0),
-1, { 0x00, 0x90, 0xcc }, NE2000DVF_DL10019 },
{ { PCMCIA_STR_SVEC_PN650TX,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCMCIA_CIS_SVEC_PN650TX },
{ PCMCIA_CARD(SVEC, PN650TX, 0),
-1, { 0x00, 0xe0, 0x98 }, NE2000DVF_DL10019 },
/*
@ -227,34 +174,17 @@ static const struct ed_product {
* match with this. FNW-3700T won't match above entries due to
* MAC address check.
*/
{ { PCMCIA_STR_PLANEX_FNW3700T,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCMCIA_CIS_PLANEX_FNW3700T },
{ PCMCIA_CARD(LINKSYS, COMBO_ECARD, 0),
-1, { 0x00, 0x90, 0xcc }, NE2000DVF_AX88190 },
{ { PCMCIA_STR_LINKSYS_ETHERFAST,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ETHERFAST, 0,
PCMCIA_CIS_LINKSYS_ETHERFAST },
{ PCMCIA_CARD(LINKSYS, ETHERFAST, 0),
-1, { 0x00, 0x80, 0xc8 }, NE2000DVF_DL10019 },
{ { PCMCIA_STR_DLINK_DE650,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ETHERFAST, 0,
PCMCIA_CIS_DLINK_DE650 },
{ PCMCIA_CARD2(LINKSYS, ETHERFAST, DLINK_DE650, 0),
-1, { 0x00, 0xe0, 0x98 }, NE2000DVF_DL10019 },
{ { PCMCIA_STR_MELCO_LPC2_TX,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ETHERFAST, 0,
PCMCIA_CIS_MELCO_LPC2_TX },
{ PCMCIA_CARD2(LINKSYS, ETHERFAST, MELCO_LPC2_TX, 0),
-1, { 0x00, 0x40, 0x26 }, NE2000DVF_DL10019 },
{ { PCMCIA_STR_LINKSYS_COMBO_ECARD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCMCIA_CIS_LINKSYS_COMBO_ECARD },
{ PCMCIA_CARD(LINKSYS, COMBO_ECARD, 0),
-1, { 0x00, 0x80, 0xc8 } },
{ { PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD, 0,
PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD },
{ PCMCIA_CARD(LINKSYS, TRUST_COMBO_ECARD, 0),
0x0120, { 0x20, 0x04, 0x49 } },
/*
@ -264,9 +194,7 @@ static const struct ed_product {
* entry rather than the more specific one above with proper
* vendor and product IDs.
*/
{ { PCMCIA_STR_LINKSYS_ECARD_2,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_LINKSYS_ECARD_2 },
{ PCMCIA_CARD(LINKSYS, ECARD_2, 0),
-1, { 0x00, 0x80, 0xc8 } },
/*
@ -283,9 +211,7 @@ static const struct ed_product {
* EtherCard" entry. Therefore, this enty must be below the
* LINKSYS_ECARD_1. --itohy
*/
{ { PCMCIA_STR_DLINK_DE650,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_DLINK_DE650 },
{ PCMCIA_CARD(DLINK, DE650, 0),
0x0040, { 0x00, 0x80, 0xc8 } },
/*
@ -301,95 +227,47 @@ static const struct ed_product {
* for the earlier version of PCLA/T (or, modify to match all CIS
* information and have three or more individual entries).
*/
{ { PCMCIA_STR_IODATA_PCLATE,
PCMCIA_VENDOR_IODATA, PCMCIA_PRODUCT_IODATA_PCLATE, 0,
PCMCIA_CIS_IODATA_PCLATE },
{ PCMCIA_CARD(IODATA, PCLATE, 0),
-1, { 0x00, 0xa0, 0xb0 } },
/*
* This entry should be placed after above PCLA-TE entry.
* See above comments for detail.
*/
{ { PCMCIA_STR_IODATA_PCLAT,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_IODATA_PCLAT },
{ PCMCIA_CARD(IODATA, PCLAT, 0),
0x0ff0, { 0x00, 0xa0, 0xb0 } },
{ { PCMCIA_STR_DAYNA_COMMUNICARD_E_1,
PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_1, 0,
PCMCIA_CIS_DAYNA_COMMUNICARD_E_1 },
{ PCMCIA_CARD(DAYNA, COMMUNICARD_E_1, 0),
0x0110, { 0x00, 0x80, 0x19 } },
{ { PCMCIA_STR_DAYNA_COMMUNICARD_E_2,
PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_2, 0,
PCMCIA_CIS_DAYNA_COMMUNICARD_E_2 },
{ PCMCIA_CARD(DAYNA, COMMUNICARD_E_2, 0),
-1, { 0x00, 0x80, 0x19 } },
{ { PCMCIA_STR_COREGA_ETHER_PCC_T,
PCMCIA_VENDOR_COREGA, PCMCIA_PRODUCT_COREGA_ETHER_PCC_T, 0,
PCMCIA_CIS_COREGA_ETHER_PCC_T },
{ PCMCIA_CARD(COREGA, ETHER_PCC_T, 0),
-1, { 0x00, 0x00, 0xf4 } },
{ { PCMCIA_STR_COREGA_ETHER_II_PCC_T,
PCMCIA_VENDOR_COREGA, PCMCIA_PRODUCT_COREGA_ETHER_II_PCC_T, 0,
PCMCIA_CIS_COREGA_ETHER_II_PCC_T },
{ PCMCIA_CARD(COREGA, ETHER_II_PCC_T, 0),
-1, { 0x00, 0x00, 0xf4 } },
{ { PCMCIA_STR_COREGA_FAST_ETHER_PCC_TX,
PCMCIA_VENDOR_COREGA, PCMCIA_PRODUCT_COREGA_FAST_ETHER_PCC_TX, 0,
PCMCIA_CIS_COREGA_FAST_ETHER_PCC_TX },
{ PCMCIA_CARD(COREGA, FAST_ETHER_PCC_TX, 0),
-1, { 0x00, 0x00, 0xf4 }, NE2000DVF_DL10019 },
{ { PCMCIA_STR_COMPEX_LINKPORT_ENET_B,
PCMCIA_VENDOR_COMPEX, PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B, 0,
PCMCIA_CIS_COMPEX_LINKPORT_ENET_B },
{ PCMCIA_CARD(COMPEX, LINKPORT_ENET_B, 0),
0x01c0, { 0x00, 0xa0, 0x0c } },
{ { PCMCIA_STR_SMC_EZCARD,
PCMCIA_VENDOR_SMC, PCMCIA_PRODUCT_SMC_EZCARD, 0,
PCMCIA_CIS_SMC_EZCARD },
{ PCMCIA_CARD(SMC, EZCARD, 0),
0x01c0, { 0x00, 0xe0, 0x29 } },
{ { PCMCIA_STR_SOCKET_LP_ETHER_CF,
PCMCIA_VENDOR_SOCKET, PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF, 0,
PCMCIA_CIS_SOCKET_LP_ETHER_CF },
{ PCMCIA_CARD(SOCKET, LP_ETHER_CF, 0),
-1, { 0x00, 0xc0, 0x1b } },
{ { PCMCIA_STR_SOCKET_LP_ETHER,
PCMCIA_VENDOR_SOCKET, PCMCIA_PRODUCT_SOCKET_LP_ETHER, 0,
PCMCIA_CIS_SOCKET_LP_ETHER },
{ PCMCIA_CARD(SOCKET, LP_ETHER, 0),
-1, { 0x00, 0xc0, 0x1b } },
{ { PCMCIA_STR_XIRCOM_CFE_10,
PCMCIA_VENDOR_XIRCOM, PCMCIA_PRODUCT_XIRCOM_CFE_10, 0,
PCMCIA_CIS_XIRCOM_CFE_10 },
{ PCMCIA_CARD(XIRCOM, CFE_10, 0),
-1, { 0x00, 0x10, 0xa4 } },
{ { PCMCIA_STR_MELCO_LPC3_TX,
PCMCIA_VENDOR_MELCO, PCMCIA_PRODUCT_MELCO_LPC3_TX, 0,
PCMCIA_CIS_MELCO_LPC3_TX },
{ PCMCIA_CARD(MELCO, LPC3_TX, 0),
-1, { 0x00, 0x40, 0x26 }, NE2000DVF_AX88190 },
{ { PCMCIA_STR_BILLIONTON_LNT10TN,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_BILLIONTON_LNT10TN },
{ PCMCIA_CARD(BILLIONTON, LNT10TN, 0),
-1, { 0x00, 0x00, 0x00 } },
{ { PCMCIA_STR_NDC_ND5100_E,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_NDC_ND5100_E },
{ PCMCIA_CARD(NDC, ND5100_E, 0),
-1, { 0x00, 0x80, 0xc6 } },
{ { PCMCIA_STR_TELECOMDEVICE_TCD_HPC100,
PCMCIA_VENDOR_TELECOMDEVICE, PCMCIA_PRODUCT_TELECOMDEVICE_TCD_HPC100, 0,
PCMCIA_CIS_TELECOMDEVICE_TCD_HPC100 },
{ PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100, 0),
-1, { 0x00, 0x40, 0x26 }, NE2000DVF_AX88190 },
{ { PCMCIA_STR_MACNICA_ME1_JEIDA,
PCMCIA_VENDOR_MACNICA, PCMCIA_PRODUCT_MACNICA_ME1_JEIDA, 0,
PCMCIA_CIS_MACNICA_ME1_JEIDA },
{ PCMCIA_CARD(MACNICA, ME1_JEIDA, 0),
0x00b8, { 0x08, 0x00, 0x42 } },
{ PCMCIA_CARD(ALLIEDTELESIS, LA_PCM, 0),
0x0ff0, { 0x00, 0x00, 0xf4 } },
#if 0
/* the rest of these are stolen from the linux pcnet pcmcia device
driver. Since I don't know the manfid or cis info strings for
@ -476,12 +354,8 @@ static const struct ed_product {
0x0000, 0x0000, NULL, NULL, 0,
0x0060, { 0x00, 0x40, 0x05 } },
#endif
{ { PCMCIA_STR_ALLIEDTELESIS_LA_PCM,
PCMCIA_VENDOR_ALLIEDTELESIS, PCMCIA_PRODUCT_ALLIEDTELESIS_LA_PCM, 0,
PCMCIA_CIS_ALLIEDTELESIS_LA_PCM },
0x0ff0, { 0x00, 0x00, 0xf4 } },
{ { NULL } }
};
static int

20
sys/dev/ep/if_ep_pccard.c
View File

@ -241,21 +241,11 @@ ep_pccard_detach(device_t dev)
}
static const struct pccard_product ep_pccard_products[] = {
{ PCMCIA_STR_3COM_3C574, PCMCIA_VENDOR_3COM,
PCMCIA_PRODUCT_3COM_3C574, 0,
PCMCIA_CIS_3COM_3C574 },
{ PCMCIA_STR_3COM_3C589, PCMCIA_VENDOR_3COM,
PCMCIA_PRODUCT_3COM_3C589, 0,
PCMCIA_CIS_3COM_3C589 },
{ PCMCIA_STR_3COM_3CXEM556, PCMCIA_VENDOR_3COM,
PCMCIA_PRODUCT_3COM_3CXEM556, 0,
PCMCIA_CIS_3COM_3CXEM556 },
{ PCMCIA_STR_3COM_3CXEM556INT, PCMCIA_VENDOR_3COM,
PCMCIA_PRODUCT_3COM_3CXEM556INT, 0,
PCMCIA_CIS_3COM_3CXEM556INT },
{ PCMCIA_STR_3COM_3CCFEM556BI, PCMCIA_VENDOR_3COM,
PCMCIA_PRODUCT_3COM_3CCFEM556BI, 0,
PCMCIA_CIS_3COM_3CCFEM556BI },
PCMCIA_CARD(3COM, 3C574, 0),
PCMCIA_CARD(3COM, 3C589, 0),
PCMCIA_CARD(3COM, 3CXEM556, 0),
PCMCIA_CARD(3COM, 3CXEM556INT, 0),
PCMCIA_CARD(3COM, 3CCFEM556BI, 0),
{ NULL }
};

35
sys/dev/fe/if_fe_pccard.c
View File

@ -62,36 +62,15 @@ static const struct fe_pccard_product {
u_int32_t mpp_ioalign; /* required alignment */
int mpp_enet_maddr;
} fe_pccard_products[] = {
{ { PCMCIA_STR_TDK_LAK_CD021BX, PCMCIA_VENDOR_TDK,
PCMCIA_PRODUCT_TDK_LAK_CD021BX, 0 },
0, -1 },
{ { PCMCIA_STR_TDK_LAK_CF010, PCMCIA_VENDOR_TDK,
PCMCIA_PRODUCT_TDK_LAK_CF010, 0 },
0, -1 },
{ PCMCIA_CARD(TDK, LAK_CD021BX, 0), 0, -1 },
{ PCMCIA_CARD(TDK, LAK_CF010, 0), 0, -1 },
#if 0 /* XXX 86960-based? */
{ { PCMCIA_STR_TDK_LAK_DFL9610, PCMCIA_VENDOR_TDK,
PCMCIA_PRODUCT_TDK_LAK_DFL9610, 1 },
0, -1 },
{ PCMCIA_CARD(TDK, LAK_DFL9610, 1), 0, -1 },
#endif
{ { PCMCIA_STR_CONTEC_CNETPC, PCMCIA_VENDOR_CONTEC,
PCMCIA_PRODUCT_CONTEC_CNETPC, 0 },
0, -1 },
{ { PCMCIA_STR_FUJITSU_LA501, PCMCIA_VENDOR_FUJITSU,
PCMCIA_PRODUCT_FUJITSU_LA501, 0 },
0x20, -1 },
{ { PCMCIA_STR_FUJITSU_LA10S, PCMCIA_VENDOR_FUJITSU,
PCMCIA_PRODUCT_FUJITSU_LA10S, 0 },
0, -1 },
{ { PCMCIA_STR_RATOC_REX_R280, PCMCIA_VENDOR_RATOC,
PCMCIA_PRODUCT_RATOC_REX_R280, 0 },
0, 0x1fc },
{ PCMCIA_CARD(CONTEC, CNETPC, 0), 0, -1 },
{ PCMCIA_CARD(FUJITSU, LA501, 0), 0x20, -1 },
{ PCMCIA_CARD(FUJITSU, LA10S, 0), 0, -1 },
{ PCMCIA_CARD(RATOC, REX_R280, 0), 0, 0x1fc },
{ { NULL } }
};

12
sys/dev/sn/if_sn_pccard.c
View File

@ -54,16 +54,10 @@
#include "card_if.h"
static const struct pccard_product sn_pccard_products[] = {
{ PCMCIA_STR_MEGAHERTZ2_XJACK, PCMCIA_VENDOR_MEGAHERTZ2,
PCMCIA_PRODUCT_MEGAHERTZ2_XJACK, 0,
PCMCIA_CIS_MEGAHERTZ2_XJACK },
{ PCMCIA_STR_NEWMEDIA_BASICS, PCMCIA_VENDOR_NEWMEDIA,
PCMCIA_PRODUCT_NEWMEDIA_BASICS, 0,
PCMCIA_CIS_NEWMEDIA_BASICS },
PCMCIA_CARD(MEGAHERTZ2, XJACK, 0),
PCMCIA_CARD(NEWMEDIA, BASICS, 0),
#if 0
{ PCMCIA_STR_SMC_8020BT, PCMCIA_VENDOR_SMC,
PCMCIA_PRODUCT_SMC_8020BT, 0,
PCMCIA_CIS_SMC_8020BT },
PCMCIA_CARD(SMC, 8020BT, 0),
#endif
{ NULL }
};