diff options
author | imp <imp@FreeBSD.org> | 2005-09-10 00:17:55 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2005-09-10 00:17:55 +0000 |
commit | 0ba77c956d208ef39d40b5f016ae4d279a9ac5ad (patch) | |
tree | 4eec2ff96bd19f9fccede39b49f5cff39107e8b6 /sys | |
parent | 14d2a8a99c7cb2cc6c8bb4c4420b933ba4c823fa (diff) | |
download | FreeBSD-src-0ba77c956d208ef39d40b5f016ae4d279a9ac5ad.zip FreeBSD-src-0ba77c956d208ef39d40b5f016ae4d279a9ac5ad.tar.gz |
MFp4:
Reduce the size of ed a little by removing some CIS based entries (others
likely can be removed too):
o The D-Link DFE-670TXD doesn't need its own entry based on strings.
o The Xircom CompactCard appears to be a TDK design, so list it there by ID
and remove the strings.
Increase the size of ed a little:
o Add support for the Addtron AE-660CT and Addtron AE-660. This is a very
generic NE-2000 clone (so generic that its CIS tags say NE-2000 generic
card!).
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/ed/if_ed_pccard.c | 7 | ||||
-rw-r--r-- | sys/dev/pccard/pccarddevs | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c index c941dd5..9e5d49a 100644 --- a/sys/dev/ed/if_ed_pccard.c +++ b/sys/dev/ed/if_ed_pccard.c @@ -122,7 +122,6 @@ static const struct ed_product { { 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}, @@ -148,10 +147,12 @@ static const struct ed_product { { 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}, + /* Same ID as DLINK DFE-670TXD. 670 has DL10022, fa411 has ax88790 */ + { PCMCIA_CARD(NETGEAR, FA411), NE2000DVF_AX88X90 | NE2000DVF_DL100XX}, { PCMCIA_CARD(NEXTCOM, NEXTHAWK), 0}, { PCMCIA_CARD(NEWMEDIA, LANSURFER), 0}, { PCMCIA_CARD(OEM2, ETHERNET), 0}, + { PCMCIA_CARD(OEM2, NE2000), 0}, { PCMCIA_CARD(PLANET, SMARTCOM2000), 0 }, { PCMCIA_CARD(PREMAX, PE200), 0}, { PCMCIA_CARD(PSION, LANGLOBAL), 0}, @@ -170,11 +171,11 @@ static const struct ed_product { { PCMCIA_CARD(SVEC, COMBOCARD), 0}, { PCMCIA_CARD(SVEC, LANCARD), 0}, { PCMCIA_CARD(TAMARACK, ETHERNET), 0}, + { PCMCIA_CARD(TDK, CFE_10), 0}, { PCMCIA_CARD(TDK, LAK_CD031), 0}, { PCMCIA_CARD(TDK, DFL5610WS), 0}, { PCMCIA_CARD(TELECOMDEVICE, LM5LT), 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/pccard/pccarddevs b/sys/dev/pccard/pccarddevs index 3992d2d..06d8028 100644 --- a/sys/dev/pccard/pccarddevs +++ b/sys/dev/pccard/pccarddevs @@ -565,6 +565,7 @@ product SYMBOL LA4100 0x0001 Symbol Spectrum24 LA4100 Series WLAN /* TDK Products */ product TDK LAK_CD011WL 0x0000 TDK LAK-CD011WL +product TDK CFE_10 0x010a Xircom CompactCard CFE-10 product TDK LAK_CD021BX 0x0200 TDK LAK-CD021BX Ethernet product TDK LAK_CF010 0x0900 TDK LAC-CF010 product TDK DFL9610 0x0d0a TDK DFL9610 Ethernet & Digital Cellular @@ -672,7 +673,6 @@ product COREGA WIRELESS_LAN_PCCL_11 { "corega", "WL&spPCCL-11", NULL, NULL } product DLINK DE650 { "D-Link", "DE-650", NULL, NULL } D-Link DE-650 product DLINK DE660 { "D-Link", "DE-660", NULL, NULL } D-Link DE-660 product DLINK DE660PLUS { "D-Link", "DE-660+", NULL, NULL } D-Link DE-660+ -product DLINK DFE670TXD { "D-Link", "DFE-670TXD", NULL, NULL } D-Link DFE-670TXD product DLINK DWL650H { "D-Link&spCorporation", "D-Link&spDWL-650H&sp11Mbps&spWLAN&spAdapter", NULL, NULL } D-Link DWL-650H product DYNALINK L10C { "DYNALINK", "L10C", NULL, NULL } Dynalink L10C /* @@ -711,6 +711,7 @@ product NTT_ME WLAN { "NTT-ME", "11Mbps&spWireless&spLAN&spPC&spCard", NULL, NU product OEM2 CDROM1 { "PCMCIA", "CD-ROM", NULL, NULL } Generic PCMCIA CD-ROM product OEM2 IDE { "PCMCIA", "IDE&spCARD", NULL, NULL } Generic PCMCIA IDE CARD product OEM2 ETHERNET { "PCMCIA", "Ethernet", NULL, NULL } NE2000 PC Card +product OEM2 NE2000 { "NE2000&spCompatible&spPC&spCard", "PCMCIA", NULL, NULL } Generic NE2000 PC Card product PLANET SMARTCOM2000 { "PCMCIA", "UE2212", NULL, NULL } Planet SmartCOM 2000 product RPTI EP400 { "RPTI&spLTD.", "EP400", "CISV100", NULL } RPTI EP400 product RPTI EP401 { "RPTI", "EP401&spEthernet&spNE2000&spCompatible", NULL, NULL } RPTI EP401 @@ -733,7 +734,6 @@ product TAMARACK ETHERNET { "TAMARACK", "Ethernet", NULL, NULL } TAMARACK NE2000 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) product WORKBIT2 NINJA_SCSI3 { "WBT", "NinjaSCSI-3", NULL, NULL } WORKBIT Ninja SCSI series -product XIRCOM CFE_10 { "Xircom", "CompactCard&spEthernet", "CFE-10", "1.00" } Xircom CompactCard CFE-10 product YEDATA EXTERNAL_FDD { "Y-E&spDATA", "External&spFDD", NULL, NULL } Y-E DATA External FDD product YIS YWL11B { "YIS&spCorp.", "YWL-11b", NULL, NULL } YIS Corp. YWL-11b product ZOOM AIR_4000 { "Zoom", "Air-4000", NULL, NULL } Zoom Air-4000 |