mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

s/PCCARD_/PCMCIA_/g in NEWCARD device tables to enable easier NetBSD sharing

Browse Source
This commit is contained in:
Warner Losh 2001-11-11 20:17:10 +00:00
parent fdacad4e76
commit 269b3a8211
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=86273
9 changed files with 267 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/conf/Makefile.i386
View File

@ -42,6 +42,6 @@ S= ../../..
%CLEAN
.include "$S/conf/kern.post.mk"
%RULES
.include "$S/conf/kern.post.mk"

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

@ -56,15 +56,15 @@ static int aic_pccard_probe(device_t);
static int aic_pccard_attach(device_t);
const struct pccard_product aic_pccard_products[] = {
{ PCCARD_STR_ADAPTEC_APA1460, PCCARD_VENDOR_ADAPTEC,
PCCARD_PRODUCT_ADAPTEC_APA1460, 0,
PCCARD_CIS_ADAPTEC_APA1460 },
{ PCCARD_STR_ADAPTEC_APA1460A, PCCARD_VENDOR_ADAPTEC,
PCCARD_PRODUCT_ADAPTEC_APA1460A, 0,
PCCARD_CIS_ADAPTEC_APA1460A },
{ PCCARD_STR_NEWMEDIA_BUSTOASTER, PCCARD_VENDOR_NEWMEDIA,
PCCARD_PRODUCT_NEWMEDIA_BUSTOASTER, 0,
PCCARD_CIS_NEWMEDIA_BUSTOASTER },
{ 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 },
{ NULL }
};

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

@ -48,9 +48,9 @@
#include "card_if.h"
static const struct pccard_product cs_pccard_products[] = {
{ PCCARD_STR_IBM_ETHERJET, PCCARD_VENDOR_IBM,
PCCARD_PRODUCT_IBM_ETHERJET, 0,
PCCARD_CIS_IBM_ETHERJET },
{ PCMCIA_STR_IBM_ETHERJET, PCMCIA_VENDOR_IBM,
PCMCIA_PRODUCT_IBM_ETHERJET, 0,
PCMCIA_CIS_IBM_ETHERJET },
{ NULL }
};
static int

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

@ -121,64 +121,64 @@ 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[] = {
{ { PCCARD_STR_AMBICOM_AMB8002T,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_AMBICOM_AMB8002T },
{ { PCMCIA_STR_AMBICOM_AMB8002T,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_AMBICOM_AMB8002T },
-1, { 0x00, 0x10, 0x7a } },
{ { PCCARD_STR_PREMAX_PE200,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_PREMAX_PE200 },
{ { PCMCIA_STR_PREMAX_PE200,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_PREMAX_PE200 },
0x07f0, { 0x00, 0x20, 0xe0 } },
{ { PCCARD_STR_DIGITAL_DEPCMXX,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_DIGITAL_DEPCMXX },
{ { PCMCIA_STR_DIGITAL_DEPCMXX,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_DIGITAL_DEPCMXX },
0x0ff0, { 0x00, 0x00, 0xe8 } },
{ { PCCARD_STR_PLANET_SMARTCOM2000,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_PLANET_SMARTCOM2000 },
{ { PCMCIA_STR_PLANET_SMARTCOM2000,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_PLANET_SMARTCOM2000 },
0xff0, { 0x00, 0x00, 0xe8 } },
{ { PCCARD_STR_DLINK_DE660,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_DLINK_DE660 },
{ { PCMCIA_STR_DLINK_DE660,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_DLINK_DE660 },
-1, { 0x00, 0x80, 0xc8 } },
{ { PCCARD_STR_RPTI_EP400,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_RPTI_EP400 },
{ { PCMCIA_STR_RPTI_EP400,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_RPTI_EP400 },
-1, { 0x00, 0x40, 0x95 } },
{ { PCCARD_STR_RPTI_EP401,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_RPTI_EP401 },
{ { PCMCIA_STR_RPTI_EP401,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_RPTI_EP401 },
-1, { 0x00, 0x40, 0x95 } },
{ { PCCARD_STR_ACCTON_EN2212,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_ACCTON_EN2212 },
{ { PCMCIA_STR_ACCTON_EN2212,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_ACCTON_EN2212 },
0x0ff0, { 0x00, 0x00, 0xe8 } },
{ { PCCARD_STR_SVEC_COMBOCARD,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_SVEC_COMBOCARD },
{ { PCMCIA_STR_SVEC_COMBOCARD,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_SVEC_COMBOCARD },
-1, { 0x00, 0xe0, 0x98 } },
{ { PCCARD_STR_SVEC_LANCARD,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_SVEC_LANCARD },
{ { PCMCIA_STR_SVEC_LANCARD,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_SVEC_LANCARD },
0x7f0, { 0x00, 0xc0, 0x6c } },
{ { PCCARD_STR_EPSON_EEN10B,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_EPSON_EEN10B, 0,
PCCARD_CIS_EPSON_EEN10B },
{ { PCMCIA_STR_EPSON_EEN10B,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_EPSON_EEN10B, 0,
PCMCIA_CIS_EPSON_EEN10B },
0xff0, { 0x00, 0x00, 0x48 } },
/*
* You have to add new entries which contains
* PCCARD_VENDOR_INVALID and/or PCCARD_PRODUCT_INVALID
* PCMCIA_VENDOR_INVALID and/or PCMCIA_PRODUCT_INVALID
* in front of this comment.
*
* There are cards which use a generic vendor and product id but needs
@ -187,39 +187,39 @@ static const struct ed_product {
* product and vendor entries.
*/
{ { PCCARD_STR_IBM_INFOMOVER,
PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_INFOMOVER, 0,
PCCARD_CIS_IBM_INFOMOVER },
{ { PCMCIA_STR_IBM_INFOMOVER,
PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER, 0,
PCMCIA_CIS_IBM_INFOMOVER },
0x0ff0, { 0x08, 0x00, 0x5a } },
{ { PCCARD_STR_IBM_INFOMOVER,
PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_INFOMOVER, 0,
PCCARD_CIS_IBM_INFOMOVER },
{ { PCMCIA_STR_IBM_INFOMOVER,
PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER, 0,
PCMCIA_CIS_IBM_INFOMOVER },
0x0ff0, { 0x00, 0x04, 0xac } },
{ { PCCARD_STR_IBM_INFOMOVER,
PCCARD_VENDOR_IBM, PCCARD_PRODUCT_IBM_INFOMOVER, 0,
PCCARD_CIS_IBM_INFOMOVER },
{ { PCMCIA_STR_IBM_INFOMOVER,
PCMCIA_VENDOR_IBM, PCMCIA_PRODUCT_IBM_INFOMOVER, 0,
PCMCIA_CIS_IBM_INFOMOVER },
0x0ff0, { 0x00, 0x06, 0x29 } },
{ { PCCARD_STR_KINGSTON_KNE2, PCCARD_VENDOR_KINGSTON,
PCCARD_PRODUCT_KINGSTON_KNE2, 0,
PCCARD_CIS_KINGSTON_KNE2 },
{ { PCMCIA_STR_KINGSTON_KNE2, PCMCIA_VENDOR_KINGSTON,
PCMCIA_PRODUCT_KINGSTON_KNE2, 0,
PCMCIA_CIS_KINGSTON_KNE2 },
-1, { 0, 0, 0 }, 0 }, /* XXX */
{ { PCCARD_STR_LINKSYS_ECARD_1,
PCCARD_VENDOR_LINKSYS, PCCARD_PRODUCT_LINKSYS_ECARD_1, 0,
PCCARD_CIS_LINKSYS_ECARD_1 },
{ { PCMCIA_STR_LINKSYS_ECARD_1,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ECARD_1, 0,
PCMCIA_CIS_LINKSYS_ECARD_1 },
-1, { 0x00, 0x80, 0xc8 } },
{ { PCCARD_STR_PLANEX_FNW3600T,
PCCARD_VENDOR_LINKSYS, PCCARD_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCCARD_CIS_PLANEX_FNW3600T },
{ { PCMCIA_STR_PLANEX_FNW3600T,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCMCIA_CIS_PLANEX_FNW3600T },
-1, { 0x00, 0x90, 0xcc }, NE2000DVF_DL10019 },
{ { PCCARD_STR_SVEC_PN650TX,
PCCARD_VENDOR_LINKSYS, PCCARD_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCCARD_CIS_SVEC_PN650TX },
{ { PCMCIA_STR_SVEC_PN650TX,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCMCIA_CIS_SVEC_PN650TX },
-1, { 0x00, 0xe0, 0x98 }, NE2000DVF_DL10019 },
/*
@ -227,34 +227,34 @@ static const struct ed_product {
* match with this. FNW-3700T won't match above entries due to
* MAC address check.
*/
{ { PCCARD_STR_PLANEX_FNW3700T,
PCCARD_VENDOR_LINKSYS, PCCARD_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCCARD_CIS_PLANEX_FNW3700T },
{ { PCMCIA_STR_PLANEX_FNW3700T,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCMCIA_CIS_PLANEX_FNW3700T },
-1, { 0x00, 0x90, 0xcc }, NE2000DVF_AX88190 },
{ { PCCARD_STR_LINKSYS_ETHERFAST,
PCCARD_VENDOR_LINKSYS, PCCARD_PRODUCT_LINKSYS_ETHERFAST, 0,
PCCARD_CIS_LINKSYS_ETHERFAST },
{ { PCMCIA_STR_LINKSYS_ETHERFAST,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ETHERFAST, 0,
PCMCIA_CIS_LINKSYS_ETHERFAST },
-1, { 0x00, 0x80, 0xc8 }, NE2000DVF_DL10019 },
{ { PCCARD_STR_DLINK_DE650,
PCCARD_VENDOR_LINKSYS, PCCARD_PRODUCT_LINKSYS_ETHERFAST, 0,
PCCARD_CIS_DLINK_DE650 },
{ { PCMCIA_STR_DLINK_DE650,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ETHERFAST, 0,
PCMCIA_CIS_DLINK_DE650 },
-1, { 0x00, 0xe0, 0x98 }, NE2000DVF_DL10019 },
{ { PCCARD_STR_MELCO_LPC2_TX,
PCCARD_VENDOR_LINKSYS, PCCARD_PRODUCT_LINKSYS_ETHERFAST, 0,
PCCARD_CIS_MELCO_LPC2_TX },
{ { PCMCIA_STR_MELCO_LPC2_TX,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_ETHERFAST, 0,
PCMCIA_CIS_MELCO_LPC2_TX },
-1, { 0x00, 0x40, 0x26 }, NE2000DVF_DL10019 },
{ { PCCARD_STR_LINKSYS_COMBO_ECARD,
PCCARD_VENDOR_LINKSYS, PCCARD_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCCARD_CIS_LINKSYS_COMBO_ECARD },
{ { PCMCIA_STR_LINKSYS_COMBO_ECARD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD, 0,
PCMCIA_CIS_LINKSYS_COMBO_ECARD },
-1, { 0x00, 0x80, 0xc8 } },
{ { PCCARD_STR_LINKSYS_TRUST_COMBO_ECARD,
PCCARD_VENDOR_LINKSYS, PCCARD_PRODUCT_LINKSYS_TRUST_COMBO_ECARD, 0,
PCCARD_CIS_LINKSYS_TRUST_COMBO_ECARD },
{ { PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD,
PCMCIA_VENDOR_LINKSYS, PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD, 0,
PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD },
0x0120, { 0x20, 0x04, 0x49 } },
/*
@ -264,9 +264,9 @@ static const struct ed_product {
* entry rather than the more specific one above with proper
* vendor and product IDs.
*/
{ { PCCARD_STR_LINKSYS_ECARD_2,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_LINKSYS_ECARD_2 },
{ { PCMCIA_STR_LINKSYS_ECARD_2,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_LINKSYS_ECARD_2 },
-1, { 0x00, 0x80, 0xc8 } },
/*
@ -283,9 +283,9 @@ static const struct ed_product {
* EtherCard" entry. Therefore, this enty must be below the
* LINKSYS_ECARD_1. --itohy
*/
{ { PCCARD_STR_DLINK_DE650,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_DLINK_DE650 },
{ { PCMCIA_STR_DLINK_DE650,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_DLINK_DE650 },
0x0040, { 0x00, 0x80, 0xc8 } },
/*
@ -301,93 +301,93 @@ 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).
*/
{ { PCCARD_STR_IODATA_PCLATE,
PCCARD_VENDOR_IODATA, PCCARD_PRODUCT_IODATA_PCLATE, 0,
PCCARD_CIS_IODATA_PCLATE },
{ { PCMCIA_STR_IODATA_PCLATE,
PCMCIA_VENDOR_IODATA, PCMCIA_PRODUCT_IODATA_PCLATE, 0,
PCMCIA_CIS_IODATA_PCLATE },
-1, { 0x00, 0xa0, 0xb0 } },
/*
* This entry should be placed after above PCLA-TE entry.
* See above comments for detail.
*/
{ { PCCARD_STR_IODATA_PCLAT,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_IODATA_PCLAT },
{ { PCMCIA_STR_IODATA_PCLAT,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_IODATA_PCLAT },
0x0ff0, { 0x00, 0xa0, 0xb0 } },
{ { PCCARD_STR_DAYNA_COMMUNICARD_E_1,
PCCARD_VENDOR_DAYNA, PCCARD_PRODUCT_DAYNA_COMMUNICARD_E_1, 0,
PCCARD_CIS_DAYNA_COMMUNICARD_E_1 },
{ { PCMCIA_STR_DAYNA_COMMUNICARD_E_1,
PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_1, 0,
PCMCIA_CIS_DAYNA_COMMUNICARD_E_1 },
0x0110, { 0x00, 0x80, 0x19 } },
{ { PCCARD_STR_DAYNA_COMMUNICARD_E_2,
PCCARD_VENDOR_DAYNA, PCCARD_PRODUCT_DAYNA_COMMUNICARD_E_2, 0,
PCCARD_CIS_DAYNA_COMMUNICARD_E_2 },
{ { PCMCIA_STR_DAYNA_COMMUNICARD_E_2,
PCMCIA_VENDOR_DAYNA, PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_2, 0,
PCMCIA_CIS_DAYNA_COMMUNICARD_E_2 },
-1, { 0x00, 0x80, 0x19 } },
{ { PCCARD_STR_COREGA_ETHER_PCC_T,
PCCARD_VENDOR_COREGA, PCCARD_PRODUCT_COREGA_ETHER_PCC_T, 0,
PCCARD_CIS_COREGA_ETHER_PCC_T },
{ { PCMCIA_STR_COREGA_ETHER_PCC_T,
PCMCIA_VENDOR_COREGA, PCMCIA_PRODUCT_COREGA_ETHER_PCC_T, 0,
PCMCIA_CIS_COREGA_ETHER_PCC_T },
-1, { 0x00, 0x00, 0xf4 } },
{ { PCCARD_STR_COREGA_ETHER_II_PCC_T,
PCCARD_VENDOR_COREGA, PCCARD_PRODUCT_COREGA_ETHER_II_PCC_T, 0,
PCCARD_CIS_COREGA_ETHER_II_PCC_T },
{ { 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 },
-1, { 0x00, 0x00, 0xf4 } },
{ { PCCARD_STR_COREGA_FAST_ETHER_PCC_TX,
PCCARD_VENDOR_COREGA, PCCARD_PRODUCT_COREGA_FAST_ETHER_PCC_TX, 0,
PCCARD_CIS_COREGA_FAST_ETHER_PCC_TX },
{ { 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 },
-1, { 0x00, 0x00, 0xf4 }, NE2000DVF_DL10019 },
{ { PCCARD_STR_COMPEX_LINKPORT_ENET_B,
PCCARD_VENDOR_COMPEX, PCCARD_PRODUCT_COMPEX_LINKPORT_ENET_B, 0,
PCCARD_CIS_COMPEX_LINKPORT_ENET_B },
{ { PCMCIA_STR_COMPEX_LINKPORT_ENET_B,
PCMCIA_VENDOR_COMPEX, PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B, 0,
PCMCIA_CIS_COMPEX_LINKPORT_ENET_B },
0x01c0, { 0x00, 0xa0, 0x0c } },
{ { PCCARD_STR_SMC_EZCARD,
PCCARD_VENDOR_SMC, PCCARD_PRODUCT_SMC_EZCARD, 0,
PCCARD_CIS_SMC_EZCARD },
{ { PCMCIA_STR_SMC_EZCARD,
PCMCIA_VENDOR_SMC, PCMCIA_PRODUCT_SMC_EZCARD, 0,
PCMCIA_CIS_SMC_EZCARD },
0x01c0, { 0x00, 0xe0, 0x29 } },
{ { PCCARD_STR_SOCKET_LP_ETHER_CF,
PCCARD_VENDOR_SOCKET, PCCARD_PRODUCT_SOCKET_LP_ETHER_CF, 0,
PCCARD_CIS_SOCKET_LP_ETHER_CF },
{ { PCMCIA_STR_SOCKET_LP_ETHER_CF,
PCMCIA_VENDOR_SOCKET, PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF, 0,
PCMCIA_CIS_SOCKET_LP_ETHER_CF },
-1, { 0x00, 0xc0, 0x1b } },
{ { PCCARD_STR_SOCKET_LP_ETHER,
PCCARD_VENDOR_SOCKET, PCCARD_PRODUCT_SOCKET_LP_ETHER, 0,
PCCARD_CIS_SOCKET_LP_ETHER },
{ { PCMCIA_STR_SOCKET_LP_ETHER,
PCMCIA_VENDOR_SOCKET, PCMCIA_PRODUCT_SOCKET_LP_ETHER, 0,
PCMCIA_CIS_SOCKET_LP_ETHER },
-1, { 0x00, 0xc0, 0x1b } },
{ { PCCARD_STR_XIRCOM_CFE_10,
PCCARD_VENDOR_XIRCOM, PCCARD_PRODUCT_XIRCOM_CFE_10, 0,
PCCARD_CIS_XIRCOM_CFE_10 },
{ { PCMCIA_STR_XIRCOM_CFE_10,
PCMCIA_VENDOR_XIRCOM, PCMCIA_PRODUCT_XIRCOM_CFE_10, 0,
PCMCIA_CIS_XIRCOM_CFE_10 },
-1, { 0x00, 0x10, 0xa4 } },
{ { PCCARD_STR_MELCO_LPC3_TX,
PCCARD_VENDOR_MELCO, PCCARD_PRODUCT_MELCO_LPC3_TX, 0,
PCCARD_CIS_MELCO_LPC3_TX },
{ { PCMCIA_STR_MELCO_LPC3_TX,
PCMCIA_VENDOR_MELCO, PCMCIA_PRODUCT_MELCO_LPC3_TX, 0,
PCMCIA_CIS_MELCO_LPC3_TX },
-1, { 0x00, 0x40, 0x26 }, NE2000DVF_AX88190 },
{ { PCCARD_STR_BILLIONTON_LNT10TN,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_BILLIONTON_LNT10TN },
{ { PCMCIA_STR_BILLIONTON_LNT10TN,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_BILLIONTON_LNT10TN },
-1, { 0x00, 0x00, 0x00 } },
{ { PCCARD_STR_NDC_ND5100_E,
PCCARD_VENDOR_INVALID, PCCARD_PRODUCT_INVALID, 0,
PCCARD_CIS_NDC_ND5100_E },
{ { PCMCIA_STR_NDC_ND5100_E,
PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, 0,
PCMCIA_CIS_NDC_ND5100_E },
-1, { 0x00, 0x80, 0xc6 } },
{ { PCCARD_STR_TELECOMDEVICE_TCD_HPC100,
PCCARD_VENDOR_TELECOMDEVICE, PCCARD_PRODUCT_TELECOMDEVICE_TCD_HPC100, 0,
PCCARD_CIS_TELECOMDEVICE_TCD_HPC100 },
{ { PCMCIA_STR_TELECOMDEVICE_TCD_HPC100,
PCMCIA_VENDOR_TELECOMDEVICE, PCMCIA_PRODUCT_TELECOMDEVICE_TCD_HPC100, 0,
PCMCIA_CIS_TELECOMDEVICE_TCD_HPC100 },
-1, { 0x00, 0x40, 0x26 }, NE2000DVF_AX88190 },
{ { PCCARD_STR_MACNICA_ME1_JEIDA,
PCCARD_VENDOR_MACNICA, PCCARD_PRODUCT_MACNICA_ME1_JEIDA, 0,
PCCARD_CIS_MACNICA_ME1_JEIDA },
{ { PCMCIA_STR_MACNICA_ME1_JEIDA,
PCMCIA_VENDOR_MACNICA, PCMCIA_PRODUCT_MACNICA_ME1_JEIDA, 0,
PCMCIA_CIS_MACNICA_ME1_JEIDA },
0x00b8, { 0x08, 0x00, 0x42 } },
#if 0
@ -477,9 +477,9 @@ static const struct ed_product {
0x0060, { 0x00, 0x40, 0x05 } },
#endif
{ { PCCARD_STR_ALLIEDTELESIS_LA_PCM,
PCCARD_VENDOR_ALLIEDTELESIS, PCCARD_PRODUCT_ALLIEDTELESIS_LA_PCM, 0,
PCCARD_CIS_ALLIEDTELESIS_LA_PCM },
{ { PCMCIA_STR_ALLIEDTELESIS_LA_PCM,
PCMCIA_VENDOR_ALLIEDTELESIS, PCMCIA_PRODUCT_ALLIEDTELESIS_LA_PCM, 0,
PCMCIA_CIS_ALLIEDTELESIS_LA_PCM },
0x0ff0, { 0x00, 0x00, 0xf4 } },
};

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

@ -241,21 +241,21 @@ ep_pccard_detach(device_t dev)
}
static const struct pccard_product ep_pccard_products[] = {
{ PCCARD_STR_3COM_3C574, PCCARD_VENDOR_3COM,
PCCARD_PRODUCT_3COM_3C574, 0,
PCCARD_CIS_3COM_3C574 },
{ PCCARD_STR_3COM_3C589, PCCARD_VENDOR_3COM,
PCCARD_PRODUCT_3COM_3C589, 0,
PCCARD_CIS_3COM_3C589 },
{ PCCARD_STR_3COM_3CXEM556, PCCARD_VENDOR_3COM,
PCCARD_PRODUCT_3COM_3CXEM556, 0,
PCCARD_CIS_3COM_3CXEM556 },
{ PCCARD_STR_3COM_3CXEM556INT, PCCARD_VENDOR_3COM,
PCCARD_PRODUCT_3COM_3CXEM556INT, 0,
PCCARD_CIS_3COM_3CXEM556INT },
{ PCCARD_STR_3COM_3CCFEM556BI, PCCARD_VENDOR_3COM,
PCCARD_PRODUCT_3COM_3CCFEM556BI, 0,
PCCARD_CIS_3COM_3CCFEM556BI },
{ 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 },
{ NULL }
};

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

@ -62,34 +62,34 @@ static const struct fe_pccard_product {
u_int32_t mpp_ioalign; /* required alignment */
int mpp_enet_maddr;
} fe_pccard_products[] = {
{ { PCCARD_STR_TDK_LAK_CD021BX, PCCARD_VENDOR_TDK,
PCCARD_PRODUCT_TDK_LAK_CD021BX, 0 },
{ { PCMCIA_STR_TDK_LAK_CD021BX, PCMCIA_VENDOR_TDK,
PCMCIA_PRODUCT_TDK_LAK_CD021BX, 0 },
0, -1 },
{ { PCCARD_STR_TDK_LAK_CF010, PCCARD_VENDOR_TDK,
PCCARD_PRODUCT_TDK_LAK_CF010, 0 },
{ { PCMCIA_STR_TDK_LAK_CF010, PCMCIA_VENDOR_TDK,
PCMCIA_PRODUCT_TDK_LAK_CF010, 0 },
0, -1 },
#if 0 /* XXX 86960-based? */
{ { PCCARD_STR_TDK_LAK_DFL9610, PCCARD_VENDOR_TDK,
PCCARD_PRODUCT_TDK_LAK_DFL9610, 1 },
{ { PCMCIA_STR_TDK_LAK_DFL9610, PCMCIA_VENDOR_TDK,
PCMCIA_PRODUCT_TDK_LAK_DFL9610, 1 },
0, -1 },
#endif
{ { PCCARD_STR_CONTEC_CNETPC, PCCARD_VENDOR_CONTEC,
PCCARD_PRODUCT_CONTEC_CNETPC, 0 },
{ { PCMCIA_STR_CONTEC_CNETPC, PCMCIA_VENDOR_CONTEC,
PCMCIA_PRODUCT_CONTEC_CNETPC, 0 },
0, -1 },
{ { PCCARD_STR_FUJITSU_LA501, PCCARD_VENDOR_FUJITSU,
PCCARD_PRODUCT_FUJITSU_LA501, 0 },
{ { PCMCIA_STR_FUJITSU_LA501, PCMCIA_VENDOR_FUJITSU,
PCMCIA_PRODUCT_FUJITSU_LA501, 0 },
0x20, -1 },
{ { PCCARD_STR_FUJITSU_LA10S, PCCARD_VENDOR_FUJITSU,
PCCARD_PRODUCT_FUJITSU_LA10S, 0 },
{ { PCMCIA_STR_FUJITSU_LA10S, PCMCIA_VENDOR_FUJITSU,
PCMCIA_PRODUCT_FUJITSU_LA10S, 0 },
0, -1 },
{ { PCCARD_STR_RATOC_REX_R280, PCCARD_VENDOR_RATOC,
PCCARD_PRODUCT_RATOC_REX_R280, 0 },
{ { PCMCIA_STR_RATOC_REX_R280, PCMCIA_VENDOR_RATOC,
PCMCIA_PRODUCT_RATOC_REX_R280, 0 },
0, 0x1fc },
{ { NULL } }

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

@ -54,16 +54,16 @@
#include "card_if.h"
static const struct pccard_product sn_pccard_products[] = {
{ PCCARD_STR_MEGAHERTZ2_XJACK, PCCARD_VENDOR_MEGAHERTZ2,
PCCARD_PRODUCT_MEGAHERTZ2_XJACK, 0,
PCCARD_CIS_MEGAHERTZ2_XJACK },
{ PCCARD_STR_NEWMEDIA_BASICS, PCCARD_VENDOR_NEWMEDIA,
PCCARD_PRODUCT_NEWMEDIA_BASICS, 0,
PCCARD_CIS_NEWMEDIA_BASICS },
{ 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 },
#if 0
{ PCCARD_STR_SMC_8020BT, PCCARD_VENDOR_SMC,
PCCARD_PRODUCT_SMC_8020BT, 0,
PCCARD_CIS_SMC_8020BT },
{ PCMCIA_STR_SMC_8020BT, PCMCIA_VENDOR_SMC,
PCMCIA_PRODUCT_SMC_8020BT, 0,
PCMCIA_CIS_SMC_8020BT },
#endif
{ NULL }
};

6
sys/dev/wi/if_wi.c
View File

@ -231,9 +231,9 @@ DRIVER_MODULE(if_wi, pci, wi_pci_driver, wi_devclass, 0, 0);
#endif
static const struct pccard_product wi_pccard_products[] = {
{ PCCARD_STR_LUCENT_WAVELAN_IEEE, PCCARD_VENDOR_LUCENT,
PCCARD_PRODUCT_LUCENT_WAVELAN_IEEE, 0,
PCCARD_CIS_LUCENT_WAVELAN_IEEE },
{ PCMCIA_STR_LUCENT_WAVELAN_IEEE, PCMCIA_VENDOR_LUCENT,
PCMCIA_PRODUCT_LUCENT_WAVELAN_IEEE, 0,
PCMCIA_CIS_LUCENT_WAVELAN_IEEE },
};
static int wi_pccard_match(dev)

158
sys/i386/conf/NEWCARD.hints
View File

@ -1,80 +1,80 @@
# $FreeBSD$
hint.fdc.0.at="isa"
hint.fdc.0.port="0x3F0"
hint.fdc.0.irq="6"
hint.fdc.0.drq="2"
hint.fd.0.at="fdc0"
hint.fd.0.drive="0"
hint.fd.1.at="fdc0"
hint.fd.1.drive="1"
hint.ata.0.at="isa"
hint.ata.0.port="0x1F0"
hint.ata.0.irq="14"
hint.ata.1.at="isa"
hint.ata.1.port="0x170"
hint.ata.1.irq="15"
hint.adv.0.at="isa"
hint.bt.0.at="isa"
hint.aha.0.at="isa"
hint.aic.0.at="isa"
hint.atkbdc.0.at="isa"
hint.atkbdc.0.port="0x060"
hint.atkbd.0.at="atkbdc"
hint.atkbd.0.irq="1"
hint.atkbd.0.flags="0x1"
hint.psm.0.at="atkbdc"
hint.psm.0.irq="12"
hint.vga.0.at="isa"
hint.sc.0.at="isa"
hint.sc.0.flags="0x100"
hint.vt.0.at="isa"
hint.npx.0.at="nexus"
hint.npx.0.port="0x0F0"
hint.npx.0.irq="13"
hint.apm.0.at="nexus"
hint.apm.0.flags="0x20"
hint.pmtimer.0.at="isa"
hint.pcic.0.at="isa"
hint.pcic.0.irq="10"
hint.pcic.0.port="0x3e0"
hint.pcic.0.maddr="0xd0000"
hint.sio.0.at="isa"
hint.sio.0.port="0x3F8"
hint.sio.0.flags="0x10"
hint.sio.0.irq="4"
hint.sio.1.at="isa"
hint.sio.1.port="0x2F8"
hint.sio.1.irq="3"
hint.sio.2.at="isa"
hint.sio.2.disabled="1"
hint.sio.2.port="0x3E8"
hint.sio.2.irq="5"
hint.sio.3.at="isa"
hint.sio.3.disabled="1"
hint.sio.3.port="0x2E8"
hint.sio.3.irq="9"
hint.ppc.0.at="isa"
hint.ppc.0.irq="7"
hint.ed.0.at="isa"
hint.ed.0.port="0x280"
hint.ed.0.irq="10"
hint.ed.0.maddr="0xd8000"
hint.cs.0.at="isa"
hint.cs.0.port="0x300"
hint.sn.0.at="isa"
hint.sn.0.port="0x300"
hint.sn.0.irq="10"
hint.ie.0.at="isa"
hint.ie.0.port="0x300"
hint.ie.0.irq="10"
hint.ie.0.maddr="0xd0000"
hint.fe.0.at="isa"
hint.fe.0.port="0x300"
hint.le.0.at="isa"
hint.le.0.port="0x300"
hint.le.0.irq="5"
hint.le.0.maddr="0xd0000"
hint.lnc.0.at="isa"
hint.lnc.0.port="0x280"
hint.lnc.0.irq="10"
hint.lnc.0.drq="0"
#hint.fdc.0.at="isa"
#hint.fdc.0.port="0x3F0"
#hint.fdc.0.irq="6"
#hint.fdc.0.drq="2"
#hint.fd.0.at="fdc0"
#hint.fd.0.drive="0"
#hint.fd.1.at="fdc0"
#hint.fd.1.drive="1"
#hint.ata.0.at="isa"
#hint.ata.0.port="0x1F0"
#hint.ata.0.irq="14"
#hint.ata.1.at="isa"
#hint.ata.1.port="0x170"
#hint.ata.1.irq="15"
#hint.adv.0.at="isa"
#hint.bt.0.at="isa"
#hint.aha.0.at="isa"
#hint.aic.0.at="isa"
#hint.atkbdc.0.at="isa"
#hint.atkbdc.0.port="0x060"
#hint.atkbd.0.at="atkbdc"
#hint.atkbd.0.irq="1"
#hint.atkbd.0.flags="0x1"
#hint.psm.0.at="atkbdc"
#hint.psm.0.irq="12"
#hint.vga.0.at="isa"
#hint.sc.0.at="isa"
#hint.sc.0.flags="0x100"
#hint.vt.0.at="isa"
#hint.npx.0.at="nexus"
#hint.npx.0.port="0x0F0"
#hint.npx.0.irq="13"
#hint.apm.0.at="nexus"
#hint.apm.0.flags="0x20"
#hint.pmtimer.0.at="isa"
#hint.pcic.0.at="isa"
#hint.pcic.0.irq="10"
#hint.pcic.0.port="0x3e0"
#hint.pcic.0.maddr="0xd0000"
#hint.sio.0.at="isa"
#hint.sio.0.port="0x3F8"
#hint.sio.0.flags="0x10"
#hint.sio.0.irq="4"
#hint.sio.1.at="isa"
#hint.sio.1.port="0x2F8"
#hint.sio.1.irq="3"
#hint.sio.2.at="isa"
#hint.sio.2.disabled="1"
#hint.sio.2.port="0x3E8"
#hint.sio.2.irq="5"
#hint.sio.3.at="isa"
#hint.sio.3.disabled="1"
#hint.sio.3.port="0x2E8"
#hint.sio.3.irq="9"
#hint.ppc.0.at="isa"
#hint.ppc.0.irq="7"
#hint.ed.0.at="isa"
#hint.ed.0.port="0x280"
#hint.ed.0.irq="10"
#hint.ed.0.maddr="0xd8000"
#hint.cs.0.at="isa"
#hint.cs.0.port="0x300"
#hint.sn.0.at="isa"
#hint.sn.0.port="0x300"
#hint.sn.0.irq="10"
#hint.ie.0.at="isa"
#hint.ie.0.port="0x300"
#hint.ie.0.irq="10"
#hint.ie.0.maddr="0xd0000"
#hint.fe.0.at="isa"
#hint.fe.0.port="0x300"
#hint.le.0.at="isa"
#hint.le.0.port="0x300"
#hint.le.0.irq="5"
#hint.le.0.maddr="0xd0000"
#hint.lnc.0.at="isa"
#hint.lnc.0.port="0x280"
#hint.lnc.0.irq="10"
#hint.lnc.0.drq="0"