diff options
| author | imp <imp@FreeBSD.org> | 2003-09-22 05:27:03 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-09-22 05:27:03 +0000 |
| commit | e29006177ee91965d80efef00a898b82a980b666 (patch) | |
| tree | 2a28727fe8229e5aa45f0acb00be50039d71800c /sys | |
| parent | a3b953a8252b389423d9b148b54178584bacc880 (diff) | |
| download | FreeBSD-src-e29006177ee91965d80efef00a898b82a980b666.zip FreeBSD-src-e29006177ee91965d80efef00a898b82a980b666.tar.gz | |
Merge from NetBSD:
1.186: onoe; Sony's PEGA-WL110 CF WLAN (which strangely has fujitsu's
vendor id)
1.185: ichiro; Quatech Inc, PCMCIA Enhanced Parallel Port Card
Also:
o update $NetBSD$
o minor tweaks to FUJITSU. We've tried to keep the CIS only entries seprate
from vendor id/product id.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pccard/pccarddevs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs index 41fde16..4e658de 100644 --- a/sys/dev/pccard/pccarddevs +++ b/sys/dev/pccard/pccarddevs @@ -1,5 +1,5 @@ $FreeBSD$ -/* $NetBSD: pcmciadevs,v 1.184 2003/07/26 10:39:32 martin Exp $ */ +/* $NetBSD: pcmciadevs,v 1.186 2003/09/16 08:26:37 onoe Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ /*- @@ -255,6 +255,7 @@ product FARALLON SKYLINE 0x0a01 SkyLINE Wireless product FUJITSU SCSI600 0x0401 Fujitsu SCSI 600 Interface product FUJITSU LA10S 0x1003 Fujitsu Compact Flash Ethernet product FUJITSU LA501 0x2000 Fujitsu Towa LA501 Ethernet +product FUJITSU WL110 0x2003 PEGA-WL110 Wireless LAN /* Gemplus */ product GEMPLUS GPR400 0x3004 GPR400 Smartcard Reader @@ -384,6 +385,7 @@ product PSION GOLDCARD 0x0020 Psion Gold Card product QLOGIC PC05 0x0104 Qlogic Fast SCSI /* Quatech */ +product QUATECH SPP_100 0x0003 Quatech Enhanced Parallel Port product QUATECH DSP_225 0x0008 Quatech Dual Serial Port /* RATOC System Inc. Products */ @@ -479,6 +481,7 @@ vendor DYNALINK -1 DynaLink vendor EIGERLABS -1 Eiger labs,Inc. vendor EPSON -1 Seiko Epson Corporation vendor EXP -1 EXP Computer Inc +vendor FUJITSU2 -1 Fujitsu vendor FUTUREDOMAIN -1 FutureDomain vendor FREECOM -1 Freecom vendor GEMTEK -1 Gem Tek @@ -544,10 +547,10 @@ product EPSON SC200 { "EPSON", "SCSI-2&spPC&spCard&spSC200", NULL, NULL } Media product EXP EXPMULTIMEDIA { "EXP&sp&sp&sp", "PnPIDE", "F1", NULL } EXP IDE/ATAPI DVD Card product EXP THINLANCOMBO { "PCMCIA&spLAN", "Ethernet", NULL, NULL } EXP ThinLan Combo product FREECOM PCCARDIDE { "FREECOM", "PCCARD-IDE", NULL, NULL } FREECOM PCCARD-IDE -product FUJITSU FMV_J181 { "PCMCIA&spMBH10302", "01", NULL, NULL } FUJITSU FMV-J181 PCMCIA Card -product FUJITSU FMV_J182 { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.01", NULL } FUJITSU FMV-J182 PCMCIA Card -product FUJITSU FMV_J182A { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.02", NULL } FUJITSU FMV-J182A PCMCIA Card -product FUJITSU ITCFJ182A { "FUJITSU", "LAN&spCard(ITCFJ182)", "Ver.01", NULL } FUJITSU ITCFJ182A CompactCard +product FUJITSU2 FMV_J181 { "PCMCIA&spMBH10302", "01", NULL, NULL } FUJITSU FMV-J181 PCMCIA Card +product FUJITSU2 FMV_J182 { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.01", NULL } FUJITSU FMV-J182 PCMCIA Card +product FUJITSU2 FMV_J182A { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.02", NULL } FUJITSU FMV-J182A PCMCIA Card +product FUJITSU2 ITCFJ182A { "FUJITSU", "LAN&spCard(ITCFJ182)", "Ver.01", NULL } FUJITSU ITCFJ182A CompactCard product FUTUREDOMAIN SCSI2GO { "Future&spDomain&spCorporation" "SCSI&spPCMCIA&spCredit&spCard&spController", NULL, NULL } Future Domain SCSI2GO product GEMTEK WLAN { "Intersil", "PRISM&sp2_5&spPCMCIA&spADAPTER", "ISL37300P", "Eval-RevA" } GEMTEK Prism2_5 WaveLAN Card product IBM SCSICARD { "IBM&spCorp.", "SCSI&spPCMCIA&spCard", NULL, NULL } IBM SCSI PCMCIA Card |
