diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/aic/aic_pccard.c | 10 | ||||
| -rw-r--r-- | sys/dev/an/if_an_pccard.c | 8 | ||||
| -rw-r--r-- | sys/dev/ata/ata-card.c | 14 | ||||
| -rw-r--r-- | sys/dev/awi/if_awi_pccard.c | 16 | ||||
| -rw-r--r-- | sys/dev/cs/if_cs_pccard.c | 2 | ||||
| -rw-r--r-- | sys/dev/ed/if_ed_pccard.c | 132 | ||||
| -rw-r--r-- | sys/dev/ep/if_ep_pccard.c | 14 | ||||
| -rw-r--r-- | sys/dev/ex/if_ex_pccard.c | 4 | ||||
| -rw-r--r-- | sys/dev/fdc/fdc_pccard.c | 2 | ||||
| -rw-r--r-- | sys/dev/fe/if_fe_pccard.c | 24 | ||||
| -rw-r--r-- | sys/dev/ncv/ncr53c500_pccard.c | 22 | ||||
| -rw-r--r-- | sys/dev/nsp/nsp_pccard.c | 8 | ||||
| -rw-r--r-- | sys/dev/owi/if_owi_pccard.c | 1 | ||||
| -rw-r--r-- | sys/dev/pccard/pccardvar.h | 34 | ||||
| -rw-r--r-- | sys/dev/ral/if_ral_pccard.c | 2 | ||||
| -rw-r--r-- | sys/dev/sn/if_sn_pccard.c | 6 | ||||
| -rw-r--r-- | sys/dev/stg/tmc18c30_pccard.c | 10 | ||||
| -rw-r--r-- | sys/dev/wi/if_wi_pccard.c | 100 | ||||
| -rw-r--r-- | sys/dev/xe/if_xe_pccard.c | 40 |
19 files changed, 238 insertions, 211 deletions
diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c index 04e92ab..37e19a5 100644 --- a/sys/dev/aic/aic_pccard.c +++ b/sys/dev/aic/aic_pccard.c @@ -56,11 +56,11 @@ static int aic_pccard_probe(device_t); static int aic_pccard_attach(device_t); const struct pccard_product aic_pccard_products[] = { - PCMCIA_CARD(ADAPTEC, APA1460, 0), - PCMCIA_CARD(ADAPTEC, APA1460A, 0), - PCMCIA_CARD(NEWMEDIA, BUSTOASTER, 0), - PCMCIA_CARD(NEWMEDIA, BUSTOASTER2, 0), - PCMCIA_CARD(NEWMEDIA, BUSTOASTER3, 0), + PCMCIA_CARD(ADAPTEC, APA1460), + PCMCIA_CARD(ADAPTEC, APA1460A), + PCMCIA_CARD(NEWMEDIA, BUSTOASTER), + PCMCIA_CARD(NEWMEDIA, BUSTOASTER2), + PCMCIA_CARD(NEWMEDIA, BUSTOASTER3), { NULL } }; diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c index ad37b67..5e5d9d1 100644 --- a/sys/dev/an/if_an_pccard.c +++ b/sys/dev/an/if_an_pccard.c @@ -108,10 +108,10 @@ DRIVER_MODULE(an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0); MODULE_DEPEND(an, wlan, 1, 1, 1); static const struct pccard_product an_pccard_products[] = { - PCMCIA_CARD(AIRONET, PC4800, 0), - PCMCIA_CARD(AIRONET, PC4500, 0), - PCMCIA_CARD(AIRONET, 350, 0), - PCMCIA_CARD(XIRCOM, CWE1130, 0), + PCMCIA_CARD(AIRONET, PC4800), + PCMCIA_CARD(AIRONET, PC4500), + PCMCIA_CARD(AIRONET, 350), + PCMCIA_CARD(XIRCOM, CWE1130), { NULL } }; diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c index d360148..069f9f1 100644 --- a/sys/dev/ata/ata-card.c +++ b/sys/dev/ata/ata-card.c @@ -52,13 +52,13 @@ __FBSDID("$FreeBSD$"); #include "pccarddevs.h" static const struct pccard_product ata_pccard_products[] = { - PCMCIA_CARD(FREECOM, PCCARDIDE, 0), - PCMCIA_CARD(EXP, EXPMULTIMEDIA, 0), - PCMCIA_CARD(IODATA3, CBIDE2, 0), - PCMCIA_CARD(OEM2, CDROM1, 0), - PCMCIA_CARD(OEM2, IDE, 0), - PCMCIA_CARD(PANASONIC, KXLC005, 0), - PCMCIA_CARD(TEAC, IDECARDII, 0), + PCMCIA_CARD(FREECOM, PCCARDIDE), + PCMCIA_CARD(EXP, EXPMULTIMEDIA), + PCMCIA_CARD(IODATA3, CBIDE2), + PCMCIA_CARD(OEM2, CDROM1), + PCMCIA_CARD(OEM2, IDE), + PCMCIA_CARD(PANASONIC, KXLC005), + PCMCIA_CARD(TEAC, IDECARDII), {NULL} }; diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c index 1f00ff7..bc8bb32 100644 --- a/sys/dev/awi/if_awi_pccard.c +++ b/sys/dev/awi/if_awi_pccard.c @@ -70,14 +70,14 @@ struct awi_pccard_softc { }; static const struct pccard_product awi_pccard_products[] = { - PCMCIA_CARD(AMD, AM79C930, 0), - PCMCIA_CARD(BAY, STACK_650, 0), - PCMCIA_CARD(BAY, STACK_660, 0), - PCMCIA_CARD(BAY, SURFER_PRO, 0), - PCMCIA_CARD(ICOM, SL200, 0), - PCMCIA_CARD(NOKIA, C020_WLAN, 0), - PCMCIA_CARD(FARALLON, SKYLINE, 0), - PCMCIA_CARD(ZOOM, AIR_4000, 0), + PCMCIA_CARD(AMD, AM79C930), + PCMCIA_CARD(BAY, STACK_650), + PCMCIA_CARD(BAY, STACK_660), + PCMCIA_CARD(BAY, SURFER_PRO), + PCMCIA_CARD(ICOM, SL200), + PCMCIA_CARD(NOKIA, C020_WLAN), + PCMCIA_CARD(FARALLON, SKYLINE), + PCMCIA_CARD(ZOOM, AIR_4000), { NULL } }; diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c index 5aee222..6935bf4 100644 --- a/sys/dev/cs/if_cs_pccard.c +++ b/sys/dev/cs/if_cs_pccard.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include "pccarddevs.h" static const struct pccard_product cs_pccard_products[] = { - PCMCIA_CARD(IBM, ETHERJET, 0), + PCMCIA_CARD(IBM, ETHERJET), { NULL } }; static int diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c index b39cb6f..91488cd 100644 --- a/sys/dev/ed/if_ed_pccard.c +++ b/sys/dev/ed/if_ed_pccard.c @@ -107,73 +107,73 @@ static const struct ed_product { #define NE2000DVF_ENADDR 0x0004 /* Get MAC from attr mem */ int enoff; } ed_pccard_products[] = { - { PCMCIA_CARD(ACCTON, EN2212, 0), 0}, - { PCMCIA_CARD(ACCTON, EN2216, 0), 0}, - { PCMCIA_CARD(ALLIEDTELESIS, LA_PCM, 0), 0}, - { PCMCIA_CARD(AMBICOM, AMB8002T, 0), 0}, - { PCMCIA_CARD(BILLIONTON, LNT10TN, 0), 0}, - { PCMCIA_CARD(BILLIONTON, CFLT10N, 0), 0}, - { PCMCIA_CARD(BUFFALO, LPC3_CLT, 0), 0}, - { PCMCIA_CARD(BUFFALO, LPC3_CLX, 0), NE2000DVF_AX88X90}, - { PCMCIA_CARD(BUFFALO, LPC_CF_CLT, 0), 0}, - { PCMCIA_CARD(CNET, NE2000, 0), 0}, - { PCMCIA_CARD(COMPEX, LINKPORT_ENET_B, 0), 0}, - { PCMCIA_CARD(COREGA, ETHER_II_PCC_T, 0), 0}, - { PCMCIA_CARD(COREGA, ETHER_II_PCC_TD, 0), 0}, - { PCMCIA_CARD(COREGA, ETHER_PCC_T, 0), 0}, - { PCMCIA_CARD(COREGA, ETHER_PCC_TD, 0), 0}, - { PCMCIA_CARD(COREGA, FAST_ETHER_PCC_TX, 0), NE2000DVF_DL100XX }, - { PCMCIA_CARD(COREGA, FETHER_PCC_TXD, 0), NE2000DVF_AX88X90 }, - { PCMCIA_CARD(COREGA, FETHER_PCC_TXF, 0), NE2000DVF_DL100XX }, - { PCMCIA_CARD(DAYNA, COMMUNICARD_E_1, 0), 0}, - { PCMCIA_CARD(DAYNA, COMMUNICARD_E_2, 0), 0}, - { PCMCIA_CARD(DLINK, DE650, 0), 0}, - { PCMCIA_CARD(DLINK, DE660, 0), 0 }, - { PCMCIA_CARD(DLINK, DE660PLUS, 0), 0}, - { PCMCIA_CARD(DLINK, DFE670TXD, 0), NE2000DVF_DL100XX }, - { PCMCIA_CARD(DYNALINK, L10C, 0), 0}, - { PCMCIA_CARD(EDIMAX, EP4000A, 0), 0}, - { PCMCIA_CARD(EPSON, EEN10B, 0), 0}, - { PCMCIA_CARD(EXP, THINLANCOMBO, 0), 0}, - { PCMCIA_CARD(GREY_CELL, DMF650TX, 0), 0}, - { PCMCIA_CARD(IBM, HOME_AND_AWAY, 0), 0}, - { PCMCIA_CARD(IBM, INFOMOVER, 0), NE2000DVF_ENADDR, 0xff0}, - { PCMCIA_CARD(IODATA3, PCLAT, 0), 0}, - { PCMCIA_CARD(KINGSTON, KNE2, 0), 0}, - { PCMCIA_CARD(LANTECH, FASTNETTX, 0),NE2000DVF_AX88X90 }, - { PCMCIA_CARD(LINKSYS, COMBO_ECARD, 0), + { PCMCIA_CARD(ACCTON, EN2212), 0}, + { PCMCIA_CARD(ACCTON, EN2216), 0}, + { PCMCIA_CARD(ALLIEDTELESIS, LA_PCM), 0}, + { PCMCIA_CARD(AMBICOM, AMB8002T), 0}, + { PCMCIA_CARD(BILLIONTON, LNT10TN), 0}, + { PCMCIA_CARD(BILLIONTON, CFLT10N), 0}, + { PCMCIA_CARD(BUFFALO, LPC3_CLT), 0}, + { PCMCIA_CARD(BUFFALO, LPC3_CLX), NE2000DVF_AX88X90}, + { PCMCIA_CARD(BUFFALO, LPC_CF_CLT), 0}, + { PCMCIA_CARD(CNET, NE2000), 0}, + { PCMCIA_CARD(COMPEX, LINKPORT_ENET_B), 0}, + { PCMCIA_CARD(COREGA, ETHER_II_PCC_T), 0}, + { PCMCIA_CARD(COREGA, ETHER_II_PCC_TD), 0}, + { PCMCIA_CARD(COREGA, ETHER_PCC_T), 0}, + { PCMCIA_CARD(COREGA, ETHER_PCC_TD), 0}, + { PCMCIA_CARD(COREGA, FAST_ETHER_PCC_TX), NE2000DVF_DL100XX }, + { PCMCIA_CARD(COREGA, FETHER_PCC_TXD), NE2000DVF_AX88X90 }, + { PCMCIA_CARD(COREGA, FETHER_PCC_TXF), NE2000DVF_DL100XX }, + { PCMCIA_CARD(DAYNA, COMMUNICARD_E_1), 0}, + { PCMCIA_CARD(DAYNA, COMMUNICARD_E_2), 0}, + { PCMCIA_CARD(DLINK, DE650), 0}, + { PCMCIA_CARD(DLINK, DE660), 0 }, + { PCMCIA_CARD(DLINK, DE660PLUS), 0}, + { PCMCIA_CARD(DLINK, DFE670TXD), NE2000DVF_DL100XX }, + { PCMCIA_CARD(DYNALINK, L10C), 0}, + { PCMCIA_CARD(EDIMAX, EP4000A), 0}, + { PCMCIA_CARD(EPSON, EEN10B), 0}, + { PCMCIA_CARD(EXP, THINLANCOMBO), 0}, + { PCMCIA_CARD(GREY_CELL, DMF650TX), 0}, + { PCMCIA_CARD(IBM, HOME_AND_AWAY), 0}, + { PCMCIA_CARD(IBM, INFOMOVER), NE2000DVF_ENADDR, 0xff0}, + { PCMCIA_CARD(IODATA3, PCLAT), 0}, + { PCMCIA_CARD(KINGSTON, KNE2), 0}, + { PCMCIA_CARD(LANTECH, FASTNETTX),NE2000DVF_AX88X90 }, + { PCMCIA_CARD(LINKSYS, COMBO_ECARD), NE2000DVF_DL100XX | NE2000DVF_AX88X90 }, - { PCMCIA_CARD(LINKSYS, ECARD_1, 0), 0}, - { PCMCIA_CARD(LINKSYS, ECARD_2, 0), 0}, - { PCMCIA_CARD(LINKSYS, ETHERFAST, 0), NE2000DVF_DL100XX }, - { PCMCIA_CARD(LINKSYS, TRUST_COMBO_ECARD, 0), 0}, - { PCMCIA_CARD(MACNICA, ME1_JEIDA, 0), 0}, - { PCMCIA_CARD(MAGICRAM, ETHER, 0), 0}, - { PCMCIA_CARD(MELCO, LPC3_CLX, 0), NE2000DVF_AX88X90 }, - { PCMCIA_CARD(MELCO, LPC3_TX, 0), NE2000DVF_AX88X90 }, - { PCMCIA_CARD(NDC, ND5100_E, 0), 0}, - { PCMCIA_CARD(NETGEAR, FA410TXC, 0), NE2000DVF_DL100XX}, - { PCMCIA_CARD(NETGEAR, FA411, 0), NE2000DVF_AX88X90}, - { PCMCIA_CARD(NEXTCOM, NEXTHAWK, 0), 0}, - { PCMCIA_CARD(OEM2, ETHERNET, 0), 0}, - { PCMCIA_CARD(PLANET, SMARTCOM2000, 0), 0 }, - { PCMCIA_CARD(PREMAX, PE200, 0), 0}, - { PCMCIA_CARD(RACORE, ETHERNET, 0), 0}, - { PCMCIA_CARD(RACORE, FASTENET, 0), NE2000DVF_AX88X90}, - { PCMCIA_CARD(RPTI, EP400, 0), 0}, - { PCMCIA_CARD(RPTI, EP401, 0), 0}, - { PCMCIA_CARD(SMC, EZCARD, 0), 0}, - { PCMCIA_CARD(SOCKET, EA_ETHER, 0), 0}, - { PCMCIA_CARD(SOCKET, LP_ETHER, 0), 0}, - { PCMCIA_CARD(SOCKET, LP_ETHER_CF, 0), 0}, - { PCMCIA_CARD(SOCKET, LP_ETH_10_100_CF, 0), NE2000DVF_DL100XX}, - { PCMCIA_CARD(SVEC, COMBOCARD, 0), 0}, - { PCMCIA_CARD(SVEC, LANCARD, 0), 0}, - { PCMCIA_CARD(TAMARACK, ETHERNET, 0), 0}, - { PCMCIA_CARD(TDK, LAK_CD031, 0), 0}, - { PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100, 0), NE2000DVF_AX88X90 }, - { PCMCIA_CARD(XIRCOM, CFE_10, 0), 0}, - { PCMCIA_CARD(ZONET, ZEN, 0), 0}, + { PCMCIA_CARD(LINKSYS, ECARD_1), 0}, + { PCMCIA_CARD(LINKSYS, ECARD_2), 0}, + { PCMCIA_CARD(LINKSYS, ETHERFAST), NE2000DVF_DL100XX }, + { PCMCIA_CARD(LINKSYS, TRUST_COMBO_ECARD), 0}, + { PCMCIA_CARD(MACNICA, ME1_JEIDA), 0}, + { PCMCIA_CARD(MAGICRAM, ETHER), 0}, + { PCMCIA_CARD(MELCO, LPC3_CLX), NE2000DVF_AX88X90 }, + { PCMCIA_CARD(MELCO, LPC3_TX), NE2000DVF_AX88X90 }, + { PCMCIA_CARD(NDC, ND5100_E), 0}, + { PCMCIA_CARD(NETGEAR, FA410TXC), NE2000DVF_DL100XX}, + { PCMCIA_CARD(NETGEAR, FA411), NE2000DVF_AX88X90}, + { PCMCIA_CARD(NEXTCOM, NEXTHAWK), 0}, + { PCMCIA_CARD(OEM2, ETHERNET), 0}, + { PCMCIA_CARD(PLANET, SMARTCOM2000), 0 }, + { PCMCIA_CARD(PREMAX, PE200), 0}, + { PCMCIA_CARD(RACORE, ETHERNET), 0}, + { PCMCIA_CARD(RACORE, FASTENET), NE2000DVF_AX88X90}, + { PCMCIA_CARD(RPTI, EP400), 0}, + { PCMCIA_CARD(RPTI, EP401), 0}, + { PCMCIA_CARD(SMC, EZCARD), 0}, + { PCMCIA_CARD(SOCKET, EA_ETHER), 0}, + { PCMCIA_CARD(SOCKET, LP_ETHER), 0}, + { PCMCIA_CARD(SOCKET, LP_ETHER_CF), 0}, + { PCMCIA_CARD(SOCKET, LP_ETH_10_100_CF), NE2000DVF_DL100XX}, + { PCMCIA_CARD(SVEC, COMBOCARD), 0}, + { PCMCIA_CARD(SVEC, LANCARD), 0}, + { PCMCIA_CARD(TAMARACK, ETHERNET), 0}, + { PCMCIA_CARD(TDK, LAK_CD031), 0}, + { PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100), NE2000DVF_AX88X90 }, + { PCMCIA_CARD(XIRCOM, CFE_10), 0}, + { PCMCIA_CARD(ZONET, ZEN), 0}, { { NULL } } }; diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c index 10da245..f86fe61 100644 --- a/sys/dev/ep/if_ep_pccard.c +++ b/sys/dev/ep/if_ep_pccard.c @@ -252,13 +252,13 @@ bad: } static const struct pccard_product ep_pccard_products[] = { - PCMCIA_CARD(3COM, 3C1, 0), - PCMCIA_CARD(3COM, 3C562, 0), - PCMCIA_CARD(3COM, 3C574, 0), /* ROADRUNNER */ - PCMCIA_CARD(3COM, 3C589, 0), - PCMCIA_CARD(3COM, 3CCFEM556BI, 0), /* ROADRUNNER */ - PCMCIA_CARD(3COM, 3CXEM556, 0), - PCMCIA_CARD(3COM, 3CXEM556INT, 0), + PCMCIA_CARD(3COM, 3C1), + PCMCIA_CARD(3COM, 3C562), + PCMCIA_CARD(3COM, 3C574), /* ROADRUNNER */ + PCMCIA_CARD(3COM, 3C589), + PCMCIA_CARD(3COM, 3CCFEM556BI), /* ROADRUNNER */ + PCMCIA_CARD(3COM, 3CXEM556), + PCMCIA_CARD(3COM, 3CXEM556INT), {NULL} }; diff --git a/sys/dev/ex/if_ex_pccard.c b/sys/dev/ex/if_ex_pccard.c index 8671e87..c41b7e9 100644 --- a/sys/dev/ex/if_ex_pccard.c +++ b/sys/dev/ex/if_ex_pccard.c @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include "pccarddevs.h" static const struct pccard_product ex_pccard_products[] = { - PCMCIA_CARD(OLICOM, OC2220, 0), - PCMCIA_CARD(INTEL, ETHEREXPPRO, 0), + PCMCIA_CARD(OLICOM, OC2220), + PCMCIA_CARD(INTEL, ETHEREXPPRO), { NULL } }; diff --git a/sys/dev/fdc/fdc_pccard.c b/sys/dev/fdc/fdc_pccard.c index f7b05f8..f960c3b 100644 --- a/sys/dev/fdc/fdc_pccard.c +++ b/sys/dev/fdc/fdc_pccard.c @@ -48,7 +48,7 @@ static int fdc_pccard_probe(device_t); static int fdc_pccard_attach(device_t); static const struct pccard_product fdc_pccard_products[] = { - PCMCIA_CARD(YEDATA, EXTERNAL_FDD, 0), + PCMCIA_CARD(YEDATA, EXTERNAL_FDD), }; static int diff --git a/sys/dev/fe/if_fe_pccard.c b/sys/dev/fe/if_fe_pccard.c index 5acff6a..a143e63 100644 --- a/sys/dev/fe/if_fe_pccard.c +++ b/sys/dev/fe/if_fe_pccard.c @@ -67,21 +67,21 @@ static const struct fe_pccard_product { #define MPP_MBH10302 1 } fe_pccard_products[] = { /* These need to be first */ - { PCMCIA_CARD(FUJITSU2, FMV_J181, 0), MPP_MBH10302 }, - { PCMCIA_CARD(FUJITSU2, FMV_J182, 0), 0 }, - { PCMCIA_CARD(FUJITSU2, FMV_J182A, 0), 0 }, - { PCMCIA_CARD(FUJITSU2, ITCFJ182A, 0), 0 }, + { PCMCIA_CARD(FUJITSU2, FMV_J181), MPP_MBH10302 }, + { PCMCIA_CARD(FUJITSU2, FMV_J182), 0 }, + { PCMCIA_CARD(FUJITSU2, FMV_J182A), 0 }, + { PCMCIA_CARD(FUJITSU2, ITCFJ182A), 0 }, /* These need to be second */ - { PCMCIA_CARD(TDK, LAK_CD021BX, 0), 0 }, - { PCMCIA_CARD(TDK, LAK_CF010, 0), 0 }, + { PCMCIA_CARD(TDK, LAK_CD021BX), 0 }, + { PCMCIA_CARD(TDK, LAK_CF010), 0 }, #if 0 /* XXX 86960-based? */ - { PCMCIA_CARD(TDK, LAK_DFL9610, 1), 0 }, + { PCMCIA_CARD(TDK, LAK_DFL9610), 0 }, #endif - { PCMCIA_CARD(CONTEC, CNETPC, 0), 0 }, - { PCMCIA_CARD(FUJITSU, LA501, 0), 0 }, - { PCMCIA_CARD(FUJITSU, LA10S, 0), 0 }, - { PCMCIA_CARD(FUJITSU, NE200T, 0), MPP_MBH10302 },/* Sold by Eagle */ - { PCMCIA_CARD(RATOC, REX_R280, 0), 0 }, + { PCMCIA_CARD(CONTEC, CNETPC), 0 }, + { PCMCIA_CARD(FUJITSU, LA501), 0 }, + { PCMCIA_CARD(FUJITSU, LA10S), 0 }, + { PCMCIA_CARD(FUJITSU, NE200T), MPP_MBH10302 },/* Sold by Eagle */ + { PCMCIA_CARD(RATOC, REX_R280), 0 }, { { NULL } } }; diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c index 7472e62..6c4533d 100644 --- a/sys/dev/ncv/ncr53c500_pccard.c +++ b/sys/dev/ncv/ncr53c500_pccard.c @@ -76,18 +76,18 @@ static const struct ncv_product { struct pccard_product prod; int flags; } ncv_products[] = { - { PCMCIA_CARD(EPSON, SC200, 0), 0}, - { PCMCIA_CARD(PANASONIC, KXLC002, 0), 0xb4d00000 }, - { PCMCIA_CARD(PANASONIC, KXLC003, 0), 0xb4d00000 }, /* untested */ - { PCMCIA_CARD(PANASONIC, KXLC004, 0), 0xb4d00100 }, - { PCMCIA_CARD(MACNICA, MPS100, 0), 0xb6250000 }, - { PCMCIA_CARD(MACNICA, MPS110, 0), 0 }, - { PCMCIA_CARD(NEC, PC9801N_J03R, 0), 0 }, - { PCMCIA_CARD(NEWMEDIA, BASICS_SCSI, 0), 0 }, - { PCMCIA_CARD(QLOGIC, PC05, 0), 0x84d00000 }, + { PCMCIA_CARD(EPSON, SC200), 0}, + { PCMCIA_CARD(PANASONIC, KXLC002), 0xb4d00000 }, + { PCMCIA_CARD(PANASONIC, KXLC003), 0xb4d00000 }, /* untested */ + { PCMCIA_CARD(PANASONIC, KXLC004), 0xb4d00100 }, + { PCMCIA_CARD(MACNICA, MPS100), 0xb6250000 }, + { PCMCIA_CARD(MACNICA, MPS110), 0 }, + { PCMCIA_CARD(NEC, PC9801N_J03R), 0 }, + { PCMCIA_CARD(NEWMEDIA, BASICS_SCSI), 0 }, + { PCMCIA_CARD(QLOGIC, PC05), 0x84d00000 }, #define FLAGS_REX5572 0x84d00000 - { PCMCIA_CARD(RATOC, REX5572, 0), FLAGS_REX5572 }, - { PCMCIA_CARD(RATOC, REX9530, 0), 0x84d00000 }, + { PCMCIA_CARD(RATOC, REX5572), FLAGS_REX5572 }, + { PCMCIA_CARD(RATOC, REX9530), 0x84d00000 }, { { NULL }, 0 } }; diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c index ac41c40..5d1a3dc 100644 --- a/sys/dev/nsp/nsp_pccard.c +++ b/sys/dev/nsp/nsp_pccard.c @@ -71,10 +71,10 @@ static int nspattach(DEVPORT_PDEVICE devi); static void nsp_card_unload (DEVPORT_PDEVICE); const struct pccard_product nsp_products[] = { - PCMCIA_CARD(IODATA3, CBSC16, 0), - PCMCIA_CARD(PANASONIC, KME, 0), - PCMCIA_CARD(WORKBIT2, NINJA_SCSI3, 0), - PCMCIA_CARD(WORKBIT, ULTRA_NINJA_16, 0), + PCMCIA_CARD(IODATA3, CBSC16), + PCMCIA_CARD(PANASONIC, KME), + PCMCIA_CARD(WORKBIT2, NINJA_SCSI3), + PCMCIA_CARD(WORKBIT, ULTRA_NINJA_16), { NULL } }; diff --git a/sys/dev/owi/if_owi_pccard.c b/sys/dev/owi/if_owi_pccard.c index e02aeed..d1c5bcd 100644 --- a/sys/dev/owi/if_owi_pccard.c +++ b/sys/dev/owi/if_owi_pccard.c @@ -60,6 +60,7 @@ #include <dev/owi/if_ieee80211.h> #include <dev/pccard/pccardvar.h> +#define PCCARD_API_LEVEL 5 #include "pccarddevs.h" #include <dev/wi/if_wavelan_ieee.h> diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h index 11efa01..c4bd0e3 100644 --- a/sys/dev/pccard/pccardvar.h +++ b/sys/dev/pccard/pccardvar.h @@ -33,6 +33,18 @@ extern int pccard_verbose; /* + * PCCARD_API_LEVEL. When set to 5, we provide a 5.x compatable API + * for driver writers that have to share their code between 5.x and 6.x. + * The 5.x compatibility interfaces will be unsupported in 7.0, at which + * point we'll only support 6 and newer, etc. + */ +#ifndef PCCARD_API_LEVEL +#define PCCARD_API_LEVEL 6 +#elif PCCARD_API_LEVEL < 5 +#error "pccard API less than 5 unsupported" +#endif + +/* * Contains information about mapped/allocated i/o spaces. */ struct pccard_io_handle { @@ -215,7 +227,6 @@ struct pccard_product { uint32_t pp_vendor; #define PCCARD_PRODUCT_ANY (0xffffffff) uint32_t pp_product; - int pp_expfunc; const char *pp_cis[4]; }; @@ -357,13 +368,26 @@ enum { #define PCCARD_S(a, b) PCMCIA_STR_ ## a ## _ ## b #define PCCARD_P(a, b) PCMCIA_PRODUCT_ ## a ## _ ## b #define PCCARD_C(a, b) PCMCIA_CIS_ ## a ## _ ## b +#if PCCARD_API_LEVEL >= 6 +#define PCMCIA_CARD_D(v, p) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \ + PCCARD_P(v, p), PCCARD_C(v, p) } +#define PCMCIA_CARD2_D(v1, p1, p2) \ + { PCMCIA_STR_ ## p2, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \ + PCMCIA_CIS_ ## p2} +#define PCMCIA_CARD(v, p) { NULL, PCMCIA_VENDOR_ ## v, \ + PCCARD_P(v, p), PCCARD_C(v, p) } +#define PCMCIA_CARD2(v1, p1, p2) \ + { NULL, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \ + PCMCIA_CIS_ ## p2} +#else #define PCMCIA_CARD_D(v, p, f) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \ - PCCARD_P(v, p), f, PCCARD_C(v, p) } + PCCARD_P(v, p), PCCARD_C(v, p) } #define PCMCIA_CARD2_D(v1, p1, p2, f) \ { PCMCIA_STR_ ## p2, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \ - f, PCMCIA_CIS_ ## p2} + PCMCIA_CIS_ ## p2} #define PCMCIA_CARD(v, p, f) { NULL, PCMCIA_VENDOR_ ## v, \ - PCCARD_P(v, p), f, PCCARD_C(v, p) } + PCCARD_P(v, p), PCCARD_C(v, p) } #define PCMCIA_CARD2(v1, p1, p2, f) \ { NULL, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \ - f, PCMCIA_CIS_ ## p2} + PCMCIA_CIS_ ## p2} +#endif diff --git a/sys/dev/ral/if_ral_pccard.c b/sys/dev/ral/if_ral_pccard.c index 9a7205d..8ec59ad 100644 --- a/sys/dev/ral/if_ral_pccard.c +++ b/sys/dev/ral/if_ral_pccard.c @@ -64,7 +64,7 @@ MODULE_DEPEND(ral, pccard, 1, 1, 1); MODULE_DEPEND(ral, wlan, 1, 1, 1); static const struct pccard_product ral_pccard_products[] = { - PCMCIA_CARD(RALINK, RT2560, 0), + PCMCIA_CARD(RALINK, RT2560), { NULL } }; diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c index 00a35d0..6928a9d 100644 --- a/sys/dev/sn/if_sn_pccard.c +++ b/sys/dev/sn/if_sn_pccard.c @@ -53,10 +53,10 @@ __FBSDID("$FreeBSD$"); #include "pccarddevs.h" static const struct pccard_product sn_pccard_products[] = { - PCMCIA_CARD(DSPSI, XJACK, 0), - PCMCIA_CARD(NEWMEDIA, BASICS, 0), + PCMCIA_CARD(DSPSI, XJACK), + PCMCIA_CARD(NEWMEDIA, BASICS), #if 0 - PCMCIA_CARD(SMC, 8020BT, 0), + PCMCIA_CARD(SMC, 8020BT), #endif { NULL } }; diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c index a66f65c..d0c732f 100644 --- a/sys/dev/stg/tmc18c30_pccard.c +++ b/sys/dev/stg/tmc18c30_pccard.c @@ -65,11 +65,11 @@ __FBSDID("$FreeBSD$"); #include "pccarddevs.h" static const struct pccard_product stg_products[] = { - PCMCIA_CARD(FUTUREDOMAIN, SCSI2GO, 0), - PCMCIA_CARD(IBM, SCSICARD, 0), - PCMCIA_CARD(RATOC, REX5536, 0), - PCMCIA_CARD(RATOC, REX5536AM, 0), - PCMCIA_CARD(RATOC, REX5536M, 0), + PCMCIA_CARD(FUTUREDOMAIN, SCSI2GO), + PCMCIA_CARD(IBM, SCSICARD), + PCMCIA_CARD(RATOC, REX5536), + PCMCIA_CARD(RATOC, REX5536AM), + PCMCIA_CARD(RATOC, REX5536M), { NULL } }; diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c index e4bac8d..72d15c7 100644 --- a/sys/dev/wi/if_wi_pccard.c +++ b/sys/dev/wi/if_wi_pccard.c @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_radiotap.h> +#define PCCARD_API_LEVEL 6 #include <dev/pccard/pccardvar.h> #include <dev/pccard/pccard_cis.h> @@ -107,55 +108,56 @@ DRIVER_MODULE(wi, pccard, wi_pccard_driver, wi_devclass, 0, 0); MODULE_DEPEND(wi, wlan, 1, 1, 1); static const struct pccard_product wi_pccard_products[] = { - PCMCIA_CARD(3COM, 3CRWE737A, 0), - PCMCIA_CARD(3COM, 3CRWE777A, 0), - PCMCIA_CARD(ACTIONTEC, PRISM, 0), - PCMCIA_CARD(ADDTRON, AWP100, 0), - PCMCIA_CARD(AIRVAST, WN_100, 0), - PCMCIA_CARD(ALLIEDTELESIS, WR211PCM, 0), - PCMCIA_CARD(ARTEM, ONAIR, 0), - PCMCIA_CARD(ASUS, WL100, 0), - PCMCIA_CARD(BAY, EMOBILITY_11B, 0), - PCMCIA_CARD(BROMAX, IWN, 0), - PCMCIA_CARD(BROMAX, IWN3, 0), - PCMCIA_CARD(BROMAX, WCF11, 0), - PCMCIA_CARD(BUFFALO, WLI_CF_S11G, 0), - PCMCIA_CARD(BUFFALO, WLI_PCM_S11, 0), - PCMCIA_CARD(COMPAQ, NC5004, 0), - PCMCIA_CARD(CONTEC, FX_DS110_PCC, 0), - PCMCIA_CARD(COREGA, WIRELESS_LAN_PCC_11, 0), - PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCA_11, 0), - PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCB_11, 0), - PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCL_11, 0), - PCMCIA_CARD(DLINK, DWL650H, 0), - PCMCIA_CARD(ELSA, XI300_IEEE, 0), - PCMCIA_CARD(ELSA, XI325_IEEE, 0), - PCMCIA_CARD(ELSA, XI800_IEEE, 0), - PCMCIA_CARD(EMTAC, WLAN, 0), - PCMCIA_CARD(ERICSSON, WIRELESSLAN, 0), - PCMCIA_CARD(GEMTEK, WLAN, 0), - PCMCIA_CARD(HWN, AIRWAY80211, 0), - PCMCIA_CARD(INTEL, PRO_WLAN_2011, 0), - PCMCIA_CARD(INTERSIL, ISL37100P, 0), - PCMCIA_CARD(INTERSIL, ISL37110P, 0), - PCMCIA_CARD(INTERSIL, ISL37300P, 0), - PCMCIA_CARD(INTERSIL2, PRISM2, 0), - PCMCIA_CARD(IODATA2, WCF12, 0), - PCMCIA_CARD(IODATA2, WNB11PCM, 0), - PCMCIA_CARD(FUJITSU, WL110, 0), - PCMCIA_CARD(LUCENT, WAVELAN_IEEE, 0), - PCMCIA_CARD(MICROSOFT, MN_520, 0), - PCMCIA_CARD(NOKIA, C020_WLAN, 0), - PCMCIA_CARD(NOKIA, C110_WLAN, 0), - PCMCIA_CARD(PLANEX, GWNS11H, 0), - PCMCIA_CARD(PROXIM, HARMONY, 0), - PCMCIA_CARD(PROXIM, RANGELANDS_8430, 0), - PCMCIA_CARD(SAMSUNG, SWL_2000N, 0), - PCMCIA_CARD(SIEMENS, SS1021, 0), - PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT, 0), - PCMCIA_CARD(SOCKET, LP_WLAN_CF, 0), - PCMCIA_CARD(SYMBOL, LA4100, 0), - PCMCIA_CARD(TDK, LAK_CD011WL, 0), + PCMCIA_CARD(3COM, 3CRWE737A), + PCMCIA_CARD(3COM, 3CRWE777A), + PCMCIA_CARD(ACTIONTEC, PRISM), + PCMCIA_CARD(ADDTRON, AWP100), + PCMCIA_CARD(AIRVAST, WN_100), + PCMCIA_CARD(ALLIEDTELESIS, WR211PCM), + PCMCIA_CARD(ARTEM, ONAIR), + PCMCIA_CARD(ASUS, WL100), + PCMCIA_CARD(BAY, EMOBILITY_11B), + PCMCIA_CARD(BROMAX, IWN), + PCMCIA_CARD(BROMAX, IWN3), + PCMCIA_CARD(BROMAX, WCF11), + PCMCIA_CARD(BUFFALO, WLI_CF_S11G), + PCMCIA_CARD(BUFFALO, WLI_PCM_S11), + PCMCIA_CARD(COMPAQ, NC5004), + PCMCIA_CARD(CONTEC, FX_DS110_PCC), + PCMCIA_CARD(COREGA, WIRELESS_LAN_PCC_11), + PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCA_11), + PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCB_11), + PCMCIA_CARD(COREGA, WIRELESS_LAN_PCCL_11), + PCMCIA_CARD(DLINK, DWL650H), + PCMCIA_CARD(ELSA, XI300_IEEE), + PCMCIA_CARD(ELSA, XI325_IEEE), + PCMCIA_CARD(ELSA, XI800_IEEE), + PCMCIA_CARD(ELSA, WIFI_FLASH), + PCMCIA_CARD(EMTAC, WLAN), + PCMCIA_CARD(ERICSSON, WIRELESSLAN), + PCMCIA_CARD(GEMTEK, WLAN), + PCMCIA_CARD(HWN, AIRWAY80211), + PCMCIA_CARD(INTEL, PRO_WLAN_2011), + PCMCIA_CARD(INTERSIL, ISL37100P), + PCMCIA_CARD(INTERSIL, ISL37110P), + PCMCIA_CARD(INTERSIL, ISL37300P), + PCMCIA_CARD(INTERSIL2, PRISM2), + PCMCIA_CARD(IODATA2, WCF12), + PCMCIA_CARD(IODATA2, WNB11PCM), + PCMCIA_CARD(FUJITSU, WL110), + PCMCIA_CARD(LUCENT, WAVELAN_IEEE), + PCMCIA_CARD(MICROSOFT, MN_520), + PCMCIA_CARD(NOKIA, C020_WLAN), + PCMCIA_CARD(NOKIA, C110_WLAN), + PCMCIA_CARD(PLANEX, GWNS11H), + PCMCIA_CARD(PROXIM, HARMONY), + PCMCIA_CARD(PROXIM, RANGELANDS_8430), + PCMCIA_CARD(SAMSUNG, SWL_2000N), + PCMCIA_CARD(SIEMENS, SS1021), + PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT), + PCMCIA_CARD(SOCKET, LP_WLAN_CF), + PCMCIA_CARD(SYMBOL, LA4100), + PCMCIA_CARD(TDK, LAK_CD011WL), { NULL } }; diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c index a5c4bde..9d31ae7 100644 --- a/sys/dev/xe/if_xe_pccard.c +++ b/sys/dev/xe/if_xe_pccard.c @@ -103,26 +103,26 @@ struct xe_pccard_product { }; static const struct xe_pccard_product xe_pccard_products[] = { - { PCMCIA_CARD_D(ACCTON, EN2226, 0), 0x43, XE_CARD_TYPE_FLAGS_MOHAWK }, - { PCMCIA_CARD_D(COMPAQ2, CPQ_10_100, 0), 0x43, XE_CARD_TYPE_FLAGS_MOHAWK }, - { PCMCIA_CARD_D(INTEL, EEPRO100, 0), 0x43, XE_CARD_TYPE_FLAGS_MOHAWK }, - { PCMCIA_CARD_D(INTEL, PRO100LAN56, 0), 0x46, XE_CARD_TYPE_FLAGS_DINGO }, - { PCMCIA_CARD_D(XIRCOM, CE, 0), 0x41, XE_CARD_TYPE_FLAGS_NO }, - { PCMCIA_CARD_D(XIRCOM, CE2, 0), 0x41, XE_CARD_TYPE_FLAGS_CE2 }, - { PCMCIA_CARD_D(XIRCOM, CE2, 0), 0x42, XE_CARD_TYPE_FLAGS_CE2 }, - { PCMCIA_CARD_D(XIRCOM, CE2_2, 0), 0x41, XE_CARD_TYPE_FLAGS_CE2 }, - { PCMCIA_CARD_D(XIRCOM, CE2_2, 0), 0x42, XE_CARD_TYPE_FLAGS_CE2 }, - { PCMCIA_CARD_D(XIRCOM, CE3, 0), 0x43, XE_CARD_TYPE_FLAGS_MOHAWK }, - { PCMCIA_CARD_D(XIRCOM, CEM, 0), 0x41, XE_CARD_TYPE_FLAGS_NO }, - { PCMCIA_CARD_D(XIRCOM, CEM2, 0), 0x42, XE_CARD_TYPE_FLAGS_CE2 }, - { PCMCIA_CARD_D(XIRCOM, CEM28, 0), 0x43, XE_CARD_TYPE_FLAGS_CE2 }, - { PCMCIA_CARD_D(XIRCOM, CEM33, 0), 0x44, XE_CARD_TYPE_FLAGS_CE2 }, - { PCMCIA_CARD_D(XIRCOM, CEM33_2, 0), 0x44, XE_CARD_TYPE_FLAGS_CE2 }, - { PCMCIA_CARD_D(XIRCOM, CEM56, 0), 0x45, XE_CARD_TYPE_FLAGS_DINGO }, - { PCMCIA_CARD_D(XIRCOM, CEM56_2, 0), 0x46, XE_CARD_TYPE_FLAGS_DINGO }, - { PCMCIA_CARD_D(XIRCOM, REM56, 0), 0x46, XE_CARD_TYPE_FLAGS_DINGO }, - { PCMCIA_CARD_D(XIRCOM, REM10, 0), 0x47, XE_CARD_TYPE_FLAGS_DINGO }, - { PCMCIA_CARD_D(XIRCOM, XEM5600, 0), 0x56, XE_CARD_TYPE_FLAGS_DINGO }, + { PCMCIA_CARD_D(ACCTON, EN2226), 0x43, XE_CARD_TYPE_FLAGS_MOHAWK }, + { PCMCIA_CARD_D(COMPAQ2, CPQ_10_100), 0x43, XE_CARD_TYPE_FLAGS_MOHAWK }, + { PCMCIA_CARD_D(INTEL, EEPRO100), 0x43, XE_CARD_TYPE_FLAGS_MOHAWK }, + { PCMCIA_CARD_D(INTEL, PRO100LAN56), 0x46, XE_CARD_TYPE_FLAGS_DINGO }, + { PCMCIA_CARD_D(XIRCOM, CE), 0x41, XE_CARD_TYPE_FLAGS_NO }, + { PCMCIA_CARD_D(XIRCOM, CE2), 0x41, XE_CARD_TYPE_FLAGS_CE2 }, + { PCMCIA_CARD_D(XIRCOM, CE2), 0x42, XE_CARD_TYPE_FLAGS_CE2 }, + { PCMCIA_CARD_D(XIRCOM, CE2_2), 0x41, XE_CARD_TYPE_FLAGS_CE2 }, + { PCMCIA_CARD_D(XIRCOM, CE2_2), 0x42, XE_CARD_TYPE_FLAGS_CE2 }, + { PCMCIA_CARD_D(XIRCOM, CE3), 0x43, XE_CARD_TYPE_FLAGS_MOHAWK }, + { PCMCIA_CARD_D(XIRCOM, CEM), 0x41, XE_CARD_TYPE_FLAGS_NO }, + { PCMCIA_CARD_D(XIRCOM, CEM2), 0x42, XE_CARD_TYPE_FLAGS_CE2 }, + { PCMCIA_CARD_D(XIRCOM, CEM28), 0x43, XE_CARD_TYPE_FLAGS_CE2 }, + { PCMCIA_CARD_D(XIRCOM, CEM33), 0x44, XE_CARD_TYPE_FLAGS_CE2 }, + { PCMCIA_CARD_D(XIRCOM, CEM33_2), 0x44, XE_CARD_TYPE_FLAGS_CE2 }, + { PCMCIA_CARD_D(XIRCOM, CEM56), 0x45, XE_CARD_TYPE_FLAGS_DINGO }, + { PCMCIA_CARD_D(XIRCOM, CEM56_2), 0x46, XE_CARD_TYPE_FLAGS_DINGO }, + { PCMCIA_CARD_D(XIRCOM, REM56), 0x46, XE_CARD_TYPE_FLAGS_DINGO }, + { PCMCIA_CARD_D(XIRCOM, REM10), 0x47, XE_CARD_TYPE_FLAGS_DINGO }, + { PCMCIA_CARD_D(XIRCOM, XEM5600), 0x56, XE_CARD_TYPE_FLAGS_DINGO }, { { NULL }, 0, 0 } }; |
