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

Remove bogus line and entry, restore cnet ne2000 add smc 8041

Browse Source
This commit is contained in:
Warner Losh 2003-04-10 07:21:11 +00:00
parent c2ff1e1682
commit 46d5f4e726
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=113322
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/pccard/pccarddevs
View File

@ -462,7 +462,7 @@ product AMD AM79C930 { "AMD", "Am79C930", NULL, NULL } AMD Am79C930
product ARGOSY SP320 { "PCMCIA", "RS-COM 2P", NULL, NULL } ARGOSY SP320 Dual port serial PCMCIA
product BILLIONTON CFLT10N { "CF", "10Base-Ethernet", "1.0", NULL } Billionton Systems Inc. CFLT10N Ethernet
product BILLIONTON LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } Billionton Systems Inc. LNT-10TN NE2000 Compatible Card
+product BILLIONTON CFLT10N { "CF", "10Base-Ethernet", "1.0", NULL } Billionproduct CNET NE2000 { "CNet", "CN40BC&spEthernet", "D", "NE2000" } CNet CN40BC NE2000 Compatible
product CNET NE2000 { "CNet", "CN40BC&spEthernet", "D", "NE2000" } CNet CN40BC NE2000 Compatible
product COREGA ETHER_PCC_T { "corega&spK.K.", "corega&spEther&spPCC-T", NULL, NULL } Corega Ether PCC-T
product COREGA ETHER_PCC_TD { "corega&spK.K.", "corega&spEther&spPCC-TD", NULL, NULL } Corega Ether PCC-TD
product COREGA ETHER_II_PCC_T { "corega&spK.K.", "corega&spEtherII&spPCC-T", NULL, NULL } Corega EtherII PCC-T
@ -533,13 +533,9 @@ product RATOC REX5572 { "RATOC&spSystem&spInc.", "SOUND/SCSI2&spCARD", NULL, NU
product RATOC REX9530 { "RATOC&spSystem&spInc.", "SCSI2&spCARD&sp37", NULL, NULL } RATOC REX-9530
product SIMPLETECH SPECTRUM24_ALT { "Symbol&spTechnologies", "LA4111&spSpectrum24&spWireless&spLAN&spPC&spCard", NULL, NULL } LA4111 Spectrum24 Wireless LAN PC Card
product SMC 2632W { "SMC", "SMC2632W", "Version&sp01.02", NULL } SMC 2632 EZ Connect Wireless PC Card
product SMC 8041 { "SMC", "8041TX-10/100-PC-Card-V2", NULL, NULL } SMC 8041TX 10/100 PC Card
product SVEC COMBOCARD { "Ethernet", "Adapter", NULL, NULL } SVEC/Hawking Tech. Combo Card
product SVEC LANCARD { "SVEC", "FD605&spPCMCIA&spEtherNet&spCard", "V1-1", NULL } SVEC PCMCIA Lan Card
/*
* vendor ID of PN650TX is LINKSYS (0x0149) and product ID is 0xc1ab, but
* it conflicts with LINKSYS Combo EthernetCard.
*/
product SVEC PN650TX -1 SVEC PN650TX 10/100 Dual Speed Fast Ethernet PC Card
product SYNERGY21 S21810 { "PCMCIA", "Ethernet", "A", "004743118001" } Synergy 21 S21810+ NE2000 Compatible Card
product TEAC IDECARDII { NULL, "NinjaATA-", NULL, NULL } TEAC IDE Card/II
product TOSHIBA CBIDE2 { "LOOKMEET", "CBIDE2&sp&sp&sp&sp&sp&sp", NULL, NULL } TOSHIBA PA2673U CBIDE2/16-bit mode (IO-DATA OEM)

7
sys/dev/pccard/pccarddevs.h
View File

@ -809,7 +809,9 @@
#define PCMCIA_CIS_BILLIONTON_LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL }
#define PCMCIA_PRODUCT_BILLIONTON_LNT10TN 0xffffffff
#define PCMCIA_STR_BILLIONTON_LNT10TN "Billionton Systems Inc. LNT-10TN NE2000 Compatible Card"
+product BILLIONTON CFLT10N { "CF", "10Base-Ethernet", "1.0", NULL } Billionproduct CNET NE2000 { "CNet", "CN40BC&spEthernet", "D", "NE2000" } CNet CN40BC NE2000 Compatible
#define PCMCIA_CIS_CNET_NE2000 { "CNet", "CN40BC Ethernet", "D", "NE2000" }
#define PCMCIA_PRODUCT_CNET_NE2000 0xffffffff
#define PCMCIA_STR_CNET_NE2000 "CNet CN40BC NE2000 Compatible"
#define PCMCIA_CIS_COREGA_ETHER_PCC_T { "corega K.K.", "corega Ether PCC-T", NULL, NULL }
#define PCMCIA_PRODUCT_COREGA_ETHER_PCC_T 0xffffffff
#define PCMCIA_STR_COREGA_ETHER_PCC_T "Corega Ether PCC-T"
@ -1002,6 +1004,9 @@
#define PCMCIA_CIS_SMC_2632W { "SMC", "SMC2632W", "Version 01.02", NULL }
#define PCMCIA_PRODUCT_SMC_2632W 0xffffffff
#define PCMCIA_STR_SMC_2632W "SMC 2632 EZ Connect Wireless PC Card"
#define PCMCIA_CIS_SMC_8041 { "SMC", "8041TX-10/100-PC-Card-V2", NULL, NULL }
#define PCMCIA_PRODUCT_SMC_8041 0xffffffff
#define PCMCIA_STR_SMC_8041 "SMC 8041TX 10/100 PC Card"
#define PCMCIA_CIS_SVEC_COMBOCARD { "Ethernet", "Adapter", NULL, NULL }
#define PCMCIA_PRODUCT_SVEC_COMBOCARD 0xffffffff
#define PCMCIA_STR_SVEC_COMBOCARD "SVEC/Hawking Tech. Combo Card"

11
sys/dev/pccard/pccardvar.h
View File

@ -373,14 +373,15 @@ 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
#define PCMCIA_CARD(v, p, f) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \
#define PCMCIA_CARD_D(v, p, f) { PCCARD_S(v, p), PCMCIA_VENDOR_ ## v, \
PCCARD_P(v, p), f, PCCARD_C(v, p) }
#define PCMCIA_CARD2(v1, p1, p2, f) \
#define PCMCIA_CARD2_D(v1, p1, p2, f) \
{ PCMCIA_STR_ ## p2, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
f, PCMCIA_CIS_ ## p2}
#define PCMCIA_CARD_ND(v, p, f) { NULL, PCMCIA_VENDOR_ ## v, \
#if 1
#define PCMCIA_CARD(v, p, f) { NULL, PCMCIA_VENDOR_ ## v, \
PCCARD_P(v, p), f, PCCARD_C(v, p) }
#define PCMCIA_CARD2_ND(v1, p1, p2, f) \
#define PCMCIA_CARD2(v1, p1, p2, f) \
{ NULL, PCMCIA_VENDOR_ ## v1, PCCARD_P(v1, p1), \
f, PCMCIA_CIS_ ## p2}
#endif