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

Merge from NetBSD plus diff reduction to netbsd's pcmciadevs 1.177 file:

Browse Source 
o NETGEAR2 -> NETGEAR_2
o PLANEX2 -> PLANEX_2
o ACTIONTEC HWC01170 -> ACTIONTEC PRISM
o linksys iwn2 -> iwn3
o Add: Ositech, DLINK_3, BAY emobility, buffalo lpc3_clt, netgear fa410TX.
  dynalink accton EN2216, corega ether II PCC TD, dlink dfe670TXD,
  dynalink l10c

Obtained from: NetBSD
This commit is contained in:
Warner Losh 2002-10-11 07:00:30 +00:00
parent 32a4457271
commit 1ac1b586c1
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/dev/pccard/pccarddevs
View File

@ -1,5 +1,5 @@
$FreeBSD$ $FreeBSD$
/* $NetBSD: pcmciadevs,v 1.163 2002/03/04 16:41:50 martin Exp $ */ /* $NetBSD: pcmciadevs,v 1.177 2002/09/15 17:43:48 bouyer Exp $ */
/* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ /* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
/*- /*-
@ -43,7 +43,7 @@ $FreeBSD$
*/ */
vendor FUJITSU 0x0004 Fujitsu Corporation vendor FUJITSU 0x0004 Fujitsu Corporation
vendor NETGEAR2 0x000b Netgear vendor NETGEAR_2 0x000b Netgear
vendor PANASONIC 0x0032 Matsushita Electric Industrial Co. vendor PANASONIC 0x0032 Matsushita Electric Industrial Co.
vendor SANDISK 0x0045 Sandisk Corporation vendor SANDISK 0x0045 Sandisk Corporation
vendor NEWMEDIA 0x0057 New Media Corporation vendor NEWMEDIA 0x0057 New Media Corporation
@ -64,7 +64,9 @@ vendor MEGAHERTZ2 0x0128 Megahertz Corporation
vendor ADAPTEC 0x012f Adaptec Corporation vendor ADAPTEC 0x012f Adaptec Corporation
vendor QUATECH 0x0137 Quatech vendor QUATECH 0x0137 Quatech
vendor COMPAQ 0x0138 Compaq vendor COMPAQ 0x0138 Compaq
vendor OSITECH 0x0140 Ositech
vendor DLINK_2 0x0143 D-Link vendor DLINK_2 0x0143 D-Link
vendor DLINK_3 0x0149 D-Link
vendor LINKSYS 0x0149 Linksys Corporation vendor LINKSYS 0x0149 Linksys Corporation
vendor NETGEAR 0x0149 Netgear vendor NETGEAR 0x0149 Netgear
vendor SIMPLETECH 0x014d Simple Technology vendor SIMPLETECH 0x014d Simple Technology
@ -92,7 +94,7 @@ vendor IODATA2 0x028a I-O DATA
vendor NWN 0x0602 No Wires Needed vendor NWN 0x0602 No Wires Needed
vendor BREEZECOM 0x0a02 BreezeCOM vendor BREEZECOM 0x0a02 BreezeCOM
vendor NEWMEDIA2 0x10cd NewMedia vendor NEWMEDIA2 0x10cd NewMedia
vendor PLANEX2 0x14ea PLANEX vendor PLANEX_2 0x14ea PLANEX
vendor ACTIONTEC 0x1668 ACTIONTEC vendor ACTIONTEC 0x1668 ACTIONTEC
vendor LASAT 0x3401 Lasat Communications A/S vendor LASAT 0x3401 Lasat Communications A/S
vendor BONDWELL 0x3b01 Bondwell vendor BONDWELL 0x3b01 Bondwell
@ -131,8 +133,8 @@ product 3COM 3CRWE777A 0x0777 3Com 3CRWE777A Airconnect
product 3COM 3C1 0x0cf1 3Com Megahertz 3C1 10Mbps LAN CF+ Card product 3COM 3C1 0x0cf1 3Com Megahertz 3C1 10Mbps LAN CF+ Card
product 3COM 3CRWE62092A 0x2092 3Com 3CRWE62092A Wireless LAN product 3COM 3CRWE62092A 0x2092 3Com 3CRWE62092A Wireless LAN
/* ACTIONTEC */ /* ACTIONTEC Products */
product ACTIONTEC HWC01170 0x0101 ACTIONTEC Wireless LAN PC CARD product ACTIONTEC PRISM 0x0101 PRISM Wireless LAN PC Card
/* Adaptec Products */ /* Adaptec Products */
product ADAPTEC APA1460 0x0001 Adaptec APA-1460 SlimSCSI product ADAPTEC APA1460 0x0001 Adaptec APA-1460 SlimSCSI
@ -153,6 +155,7 @@ product ARCHOS ARC_ATAPI 0x0043 MiniCD
product BAY STACK_650 0x0804 BayStack 650 Wireless LAN product BAY STACK_650 0x0804 BayStack 650 Wireless LAN
product BAY SURFER_PRO 0x0806 AirSurfer Pro Wireless LAN product BAY SURFER_PRO 0x0806 AirSurfer Pro Wireless LAN
product BAY STACK_660 0x0807 BayStack 660 Wireless LAN product BAY STACK_660 0x0807 BayStack 660 Wireless LAN
product BAY EMOBILITY_11B 0x080a e-Mobility 11Mb Wireless LAN
/* Bondwell */ /* Bondwell */
product BONDWELL B236 0x0000 Game Card Joystick product BONDWELL B236 0x0000 Game Card Joystick
@ -162,6 +165,7 @@ product BREEZECOM BREEZENET 0x0102 BreezeCOM BreezeNET
/* BUFFALO */ /* BUFFALO */
product BUFFALO WLI_PCM_S11 0x0305 BUFFALO AirStation 11Mbps WLAN product BUFFALO WLI_PCM_S11 0x0305 BUFFALO AirStation 11Mbps WLAN
product BUFFALO LPC3_CLT 0x030a BUFFALO LPC3-CLT Ethernet Adapter
product BUFFALO WLI_CF_S11G 0x030b BUFFALO AirStation 11Mbps CF WLAN product BUFFALO WLI_CF_S11G 0x030b BUFFALO AirStation 11Mbps CF WLAN
/* Compaq Products */ /* Compaq Products */
@ -254,7 +258,8 @@ product LINKSYS ETHERFAST 0x0230 Linksys Etherfast 10/100 Ethernet
product LINKSYS ECARD_1 0x0265 Linksys EthernetCard or D-Link DE-650 product LINKSYS ECARD_1 0x0265 Linksys EthernetCard or D-Link DE-650
product LINKSYS COMBO_ECARD 0xc1ab Linksys Combo EthernetCard product LINKSYS COMBO_ECARD 0xc1ab Linksys Combo EthernetCard
product LINKSYS2 IWN 0x1612 Instant Wireless Network PC Card product LINKSYS2 IWN 0x1612 Instant Wireless Network PC Card
product LINKSYS2 IWN2 0x1613 Instant Wireless Network PC Card product LINKSYS2 IWN3 0x1613 Instant Wireless Network PC Card, Versin 3
product LINKSYS2 WCF11 0x3301 Instant Wireless Network CF Card
/* Lucent WaveLAN/IEEE */ /* Lucent WaveLAN/IEEE */
product LUCENT WAVELAN_IEEE 0x0002 WaveLAN/IEEE product LUCENT WAVELAN_IEEE 0x0002 WaveLAN/IEEE
@ -289,9 +294,10 @@ product NEWMEDIA WAVJAMMER 0xe005 NewMedia .WAVjammer
product NEWMEDIA2 BUSTOASTER 0x0001 NewMedia BusToaster product NEWMEDIA2 BUSTOASTER 0x0001 NewMedia BusToaster
/* Netgear */ /* Netgear */
product NETGEAR FA410TX 0x0230 Netgear FA410TX
product NETGEAR FA410TXC 0x4530 Netgear FA410TXC product NETGEAR FA410TXC 0x4530 Netgear FA410TXC
product NETGEAR FA411 0x0411 Netgear FA411 product NETGEAR FA411 0x0411 Netgear FA411
product NETGEAR2 MA401RA 0x7300 Netgear MA401RA product NETGEAR_2 MA401RA 0x7300 Netgear MA401RA
/* National Instruments */ /* National Instruments */
product NI PCMCIA_GPIB 0x4882 National Instruments PCMCIA-GPIB product NI PCMCIA_GPIB 0x4882 National Instruments PCMCIA-GPIB
@ -307,6 +313,9 @@ product NWN WLAN_1148 0x0003 NWN 1148 WLAN
/* Olicom Products */ /* Olicom Products */
product OLICOM TR 0x2132 GoCard Token Ring 16/4 product OLICOM TR 0x2132 GoCard Token Ring 16/4
/* Ositech Products */
product OSITECH TRUMPCARD_SOD 0x0008 Ositech Seven of Diamonds Ethernet Card
/* Panasonic Products */ /* Panasonic Products */
product PANASONIC KXLC002 0x0304 Panasonic 4X CD-ROM Interface Card product PANASONIC KXLC002 0x0304 Panasonic 4X CD-ROM Interface Card
product PANASONIC KXLC003 0x0504 Panasonic 8X CD-ROM Interface Card product PANASONIC KXLC003 0x0504 Panasonic 8X CD-ROM Interface Card
@ -314,7 +323,7 @@ product PANASONIC KXLC005 0x2704 Panasonic 16X CD-ROM Interface Card
product PANASONIC KME 0x2604 Panasonic CD-R/RW Interface product PANASONIC KME 0x2604 Panasonic CD-R/RW Interface
/* Planex */ /* Planex */
product PLANEX2 GWNS11H 0xb001 Planex GW-NS11H product PLANEX_2 GWNS11H 0xb001 Planex GW-NS11H
/* Proxim */ /* Proxim */
product PROXIM ROAMABOUT_2400FH 0x1058 Digital RoamAbout 2400FH product PROXIM ROAMABOUT_2400FH 0x1058 Digital RoamAbout 2400FH
@ -367,7 +376,7 @@ product TDK LAK_CD011WL 0x0000 TDK LAK-CD011WL
product TDK LAK_CD021BX 0x0200 TDK LAK-CD021BX Ethernet product TDK LAK_CD021BX 0x0200 TDK LAK-CD021BX Ethernet
product TDK LAK_CF010 0x0900 TDK LAC-CF010 product TDK LAK_CF010 0x0900 TDK LAC-CF010
product TDK DFL9610 0x0d0a TDK DFL9610 Ethernet & Digital Cellular product TDK DFL9610 0x0d0a TDK DFL9610 Ethernet & Digital Cellular
product TDK C6500012 0x410a TDK ELSA MicroLink MC all product TDK C6500012 0x410a TDK ELSA MicroLink MC all
/* Telecom Device */ /* Telecom Device */
product TELECOMDEVICE TCD_HPC100 0x0202 Telecom Device TCD-HPC100 product TELECOMDEVICE TCD_HPC100 0x0202 Telecom Device TCD-HPC100
@ -404,6 +413,7 @@ vendor BILLIONTON -1 Billionton Systems Inc.
vendor CNET -1 CNet vendor CNET -1 CNet
vendor DIGITAL -1 Digital Equipment Corporation vendor DIGITAL -1 Digital Equipment Corporation
vendor DLINK -1 D-Link vendor DLINK -1 D-Link
vendor DYNALINK -1 DynaLink
vendor EIGERLABS -1 Eiger labs,Inc. vendor EIGERLABS -1 Eiger labs,Inc.
vendor EPSON -1 Seiko Epson Corporation vendor EPSON -1 Seiko Epson Corporation
vendor EXP -1 EXP Computer Inc vendor EXP -1 EXP Computer Inc
@ -424,15 +434,17 @@ vendor YEDATA -1 Y-E DATA
vendor ZOOM -1 ZOOM vendor ZOOM -1 ZOOM
product ACCTON EN2212 { "ACCTON", "EN2212", NULL, NULL } Accton EN2212 product ACCTON EN2212 { "ACCTON", "EN2212", NULL, NULL } Accton EN2212
product ACCTON EN2216 { "ACCTON", "EN2216-PCMCIA-ETHERNET", "EN2216R01", NULL } Accton EN2216
product ADDTRON AWP100 { "Addtron", "AWP-100&spWireless&spPCMCIA", "Version&sp01.02", NULL } product ADDTRON AWP100 { "Addtron", "AWP-100&spWireless&spPCMCIA", "Version&sp01.02", NULL }
product AMBICOM AMB8002T { "AmbiCom&spInc", "AMB8002T", NULL, NULL } AmbiCom AMB8002T product AMBICOM AMB8002T { "AmbiCom&spInc", "AMB8002T", NULL, NULL } AmbiCom AMB8002T
product ARGOSY SP320 { "PCMCIA", "RS-COM 2P", NULL, NULL } ARGOSY SP320 Dual port serial PCMCIA
product AMD AM79C930 { "AMD", "Am79C930", NULL, NULL } AMD Am79C930 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 LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } Billionton Systems Inc. LNT-10TN NE2000 Compatible Card product BILLIONTON LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } Billionton Systems Inc. LNT-10TN NE2000 Compatible Card
product 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_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_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 product COREGA ETHER_II_PCC_T { "corega&spK.K.", "corega&spEtherII&spPCC-T", NULL, NULL } Corega EtherII PCC-T
product COREGA ETHER_II_PCC_TD { "corega&spK.K.", "corega&spEtherII&spPCC-TD", NULL, NULL } Corega EtherII PCC-TD
product COREGA FAST_ETHER_PCC_TX { "corega&spK.K.", "corega&spFastEther&spPCC-TX", NULL, NULL } Corega FastEther PCC-TX product COREGA FAST_ETHER_PCC_TX { "corega&spK.K.", "corega&spFastEther&spPCC-TX", NULL, NULL } Corega FastEther PCC-TX
product COREGA FETHER_PCC_TXD { "corega&spK.K.", "corega&spFEther&spPCC-TXD", NULL, NULL } Corega FEther PCC-TXD product COREGA FETHER_PCC_TXD { "corega&spK.K.", "corega&spFEther&spPCC-TXD", NULL, NULL } Corega FEther PCC-TXD
product COREGA FETHER_PCC_TXF { "corega", "FEther&spPCC-TXF", NULL, NULL } Corega FEther PCC-TXF product COREGA FETHER_PCC_TXF { "corega", "FEther&spPCC-TXF", NULL, NULL } Corega FEther PCC-TXF
@ -444,6 +456,8 @@ product DIGITAL DEPCMXX { "DIGITAL", "DEPCM-XX", NULL, NULL } DEC DEPCM-BA
product DLINK DE650 { "D-Link", "DE-650", NULL, NULL } D-Link DE-650 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 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 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 DYNALINK L10C { "DYNALINK", "L10C", NULL, NULL } Dynalink L10C
/* /*
* vendor ID of EPX_AA2000 is Fujitsu (0x0004) and product ID is 0x2000, but * vendor ID of EPX_AA2000 is Fujitsu (0x0004) and product ID is 0x2000, but
* it conflicts with Fujitsu Towa LA501 Ethernet. * it conflicts with Fujitsu Towa LA501 Ethernet.