From 41085dd3303e3d5893e362fa1b503ff69e418c70 Mon Sep 17 00:00:00 2001 From: imp Date: Sat, 25 Mar 2000 04:04:24 +0000 Subject: Merge 1.60 to 1.85 of NetBSD's pcmciadevs into our database. --- sys/dev/pccard/pccarddevs | 80 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 13 deletions(-) (limited to 'sys/dev/pccard') diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs index 917d30a..8affabc 100644 --- a/sys/dev/pccard/pccarddevs +++ b/sys/dev/pccard/pccarddevs @@ -1,5 +1,5 @@ $FreeBSD$ -/* $NetBSD: pcmciadevs,v 1.60 1999/11/29 02:28:19 jun Exp $ */ +/* $NetBSD: pcmciadevs,v 1.85 2000/03/22 21:39:57 mycroft Exp $ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,6 +42,7 @@ $FreeBSD$ */ vendor FUJITSU 0x0004 Fujitsu Corporation +vendor PANASONIC 0x0032 Matsushita Electric Industrial Co. vendor SANDISK 0x0045 Sandisk Corporation vendor NEWMEDIA 0x0057 NewMedia Corporation vendor INTEL 0x0089 Intel Corporation @@ -51,19 +52,26 @@ vendor 3COM 0x0101 3Com Corporation vendor MEGAHERTZ 0x0102 Megahertz Corporation vendor SOCKET 0x0104 Socket Communications vendor TDK 0x0105 TDK Corporation +vendor XIRCOM 0x0105 Xircom vendor SMC 0x0108 Standard Microsystems Corporation vendor USROBOTICS 0x0115 US Robotics Corporation vendor MEGAHERTZ2 0x0128 Megahertz Corporation vendor ADAPTEC 0x012f Adaptec Corporation -vendor COMPAQ1 0x0138 Compaq Corporation (1) +vendor COMPAQ 0x0138 Compaq vendor LINKSYS 0x0149 Linksys Corporation vendor SIMPLETECH 0x014d Simple Technology vendor LUCENT 0x0156 Lucent Technologies -vendor COMPAQ2 0x0183 Compaq Corporation (2) +vendor AIRONET 0x015f Aironet Wireless Communications +vendor COMPAQ2 0x0183 Compaq vendor DAYNA 0x0194 Dayna Corporation +vendor RAYTHEON 0x01a6 Raytheon vendor IODATA 0x01bf I-O DATA vendor BAY 0x01eb Bay Networks +vendor NOKIA 0x023d Nokia Communications +vendor LASAT 0x3401 Lasat Communications A/S +vendor LEXARMEDIA 0x4e01 Lexar Media vendor COMPEX 0x8a01 Compex Corporation +vendor MELCO 0x8a01 Melco Corporation vendor CONTEC 0xc001 Contec vendor COREGA 0xc00f Corega K.K. vendor ALLIEDTELESIS 0xc00f Allied Telesis K.K. @@ -79,6 +87,7 @@ product ADAPTEC APA1460_1 0x0001 Adaptec APA-1460/A SCSI Host Adapter product ADAPTEC APA1460_2 0x0002 Adaptec APA-1460/B SCSI Host Adapter /* 3COM Products */ +product 3COM 3C1 0x0cf1 3Com Megahertz 3C1 10Mbps LAN CF+ Card product 3COM 3C562 0x0562 3Com 3c562 33.6 Modem/10Mbps Ethernet product 3COM 3C589 0x0589 3Com 3c589 10Mbps Ethernet product 3COM 3C574 0x0574 3Com 3c574-TX 10/100Mbps Ethernet @@ -124,7 +133,11 @@ product IBM ETHERJET 0x003f IBM EtherJet Ethernet /* I-O DATA */ product IODATA PCLATE 0x2216 I-O DATA PCLA/TE +/* Lexar Media */ +product LEXARMEDIA COMPATFLASH 0x0100 Lexar Media CompactFlash + /* Linksys corporation */ +product LINKSYS ETHERFAST 0x0230 Linksys Etherfast 10/100 Ethernet product LINKSYS ECARD_1 0x0265 Linksys EthernetCard or D-Link DE-650 product LINKSYS COMBO_ECARD 0xc1ab Linksys Combo EthernetCard product LINKSYS TRUST_COMBO_ECARD 0x021b Trust (Linksys) Combo EthernetCard @@ -136,6 +149,15 @@ product MEGAHERTZ XJ5560 0x0034 Megahertz X-JACK 56kbps Modem product MEGAHERTZ2 XJACK 0x0103 Megahertz X-JACK Ethernet product MEGAHERTZ XJEM3336 0x0006 Megahertz X-JACK Ethernet Modem +/* Melco Products */ +product MELCO LPC3_TX 0xc1ab Melco LPC3-TX + +/* Nokia Products */ +product NOKIA C020_WLAN 0x20c0 Nokia C020 WLAN Card + +/* Panasonic Products */ +product PANASONIC KXLC002 0x0304 Panasonic 4X CD-ROM Interface Card + /* US Robotics Products */ product USROBOTICS WORLDPORT144 0x3330 US Robotics WorldPort 14.4 Modem @@ -163,7 +185,11 @@ product TDK XIR_CEM_10 0x110a Xircom CreditCard Ethernet + Modem product TDK XIR_CEM_28 0x110b Xircom CreditCard Ethernet + Modem 28.8 product TDK XIR_PS_CE2_10 0x010b Xircom CreditCard CE2 Ethernet product TDK XIR_CE3_10_100 0x010a Xircom CreditCard CE3 10/100 Ethernet -product TDK XIR_CNW 0x0802 Xircom CreditCard Netwave +/* conflicts with above + * product TDK XIR_CFE_10 0x010a Xircom CompactCard CFE-10 + */ +product TDK XIR_CNW_801 0x0801 Xircom CreditCard Netwave (Canada) +product TDK XIR_CNW_802 0x0802 Xircom CreditCard Netwave (US) /* New Media Products */ product NEWMEDIA BASICS 0x0019 New Media BASICS Ethernet @@ -171,7 +197,7 @@ product NEWMEDIA BUSTOASTER 0xc102 New Media BusToaster SCSI Host Adapter /* Standard Microsystems Corporation Products */ product SMC 8016 0x0105 SMC 8016 EtherCard -product SMC EZCARD 0x8022 SMC EXCard 10 PCMCIA +product SMC EZCARD 0x8022 SMC EZCard 10 PCMCIA /* Contec C-NET(PC) */ product CONTEC CNETPC 0x0000 Contec C-NET(PC)C @@ -183,9 +209,19 @@ product ALLIEDTELESIS LA_PCM 0x0002 Allied Telesis LA-PCM product RATOC REX_R280 0x1 RATOC REX-R280 /* Lucent WaveLAN/IEEE */ -product LUCENT WAVELAN_IEEE 0x0002 WaveLAN/IEEE +product LUCENT WAVELAN_IEEE 0x0002 WaveLAN/IEEE -product BAY STACK_650 0x804 BayStack 650 Wireless LAN +/* Aironet */ +product AIRONET PC4500 0x0005 Aironet PC4500 Wireless LAN Adapter +product AIRONET PC4800 0x0007 Aironet PC4800 Wireless LAN Adapter + +/* Bay Networks */ +product BAY STACK_650 0x0804 BayStack 650 Wireless LAN +product BAY SURFER_PRO 0x0806 AirSurfer Pro Wireless LAN +product BAY STACK_660 0x0807 BayStack 660 Wireless LAN + +/* Raylink/WebGear */ +product RAYTHEON WLAN 0x0000 WLAN Adapter /* Cards we know only by their cis */ vendor PREMAX -1 Premax @@ -200,30 +236,48 @@ vendor TEAC -1 TEAC vendor SVEC -1 SVEC/Hawking Technology vendor NAKAGAWAMETAL -1 NAKAGAWA METAL vendor AMBICOM -1 AmbiCom Inc +vendor EPSON -1 Seiko Epson Corporation +vendor EXP -1 EXP Computer Inc +vendor ICOM -1 ICOM Inc +vendor BILLIONTON -1 Billionton Systems Inc. +vendor AMD -1 AMD product MEGAHERTZ XJ2288 { "MEGAHERTZ", "MODEM&spXJ2288", NULL, NULL } Megahertz XJ2288 Modem product PREMAX PE200 { "PMX&sp&sp&sp", "PE-200", NULL, NULL } PreMax PE-200 product PLANET SMARTCOM2000 { "PCMCIA", "UE2212", NULL, NULL } Planet SmartCOM 2000 /* - * vendor ID of FNW-3600-T is LINKSYS(0x0149) and product ID is 0xc1ab, but - * it conflicts with LINKSYS Combo EhternetCard. + * vendor ID of both FNW-3600-T and FNW-3700-T is LINKSYS (0x0149) and + * product ID is 0xc1ab, but it conflicts with LINKSYS Combo EthernetCard. */ -product PLANEX FNW3600T { "Fast&spEthernet", "Adapter", "1.0", NULL } Planex FNW-3600-T +product PLANEX FNW3600T -1 Planex FNW-3600-T +product PLANEX FNW3700T -1 Planex FNW-3700-T 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 RPTI EP400 { "RPTI&spLTD.", "EP400", "CISV100", NULL } RPTI EP400 product RPTI EP401 { "RPTI", "EP401&spEthernet&spNE2000&spCompatible", NULL, NULL } RPTI EP401 product ACCTON EN2212 { "ACCTON", "EN2212", NULL, NULL } Accton EN2212 product YEDATA EXTERNAL_FDD { "Y-E&spDATA", "External&spFDD", NULL, NULL } Y-E DATA External FDD product DIGITAL DEPCMXX { "DIGITAL", "DEPCM-XX", NULL, NULL } DEC DEPCM-BA product TEAC IDECARDII { NULL, "NinjaATA-", NULL, NULL } TEAC IDE Card/II product LINKSYS ECARD_2 { "LINKSYS", "E-CARD", NULL, NULL } Linksys E-Card -product COREGA ETHER_PCC_T { "corega&spK.K.", "corega&spEther&spPCC-T", NULL, NULL } Corega -product COREGA ETHER_II_PCC_T { "corega&spK.K.", "corega&spEtherII&spPCC-T", NULL, NULL } Corega -product COREGA FAST_ETHER_PCC_TX { "corega&spK.K.", "corega&spFastEther&spPCC-TX", NULL, NULL } Corega +product COREGA ETHER_PCC_T { "corega&spK.K.", "corega&spEther&spPCC-T", NULL, NULL } Corega Ether PCC-T +product COREGA ETHER_II_PCC_T { "corega&spK.K.", "corega&spEtherII&spPCC-T", NULL, NULL } Corega EtherII PCC-T +product COREGA FAST_ETHER_PCC_TX { "corega&spK.K.", "corega&spFastEther&spPCC-TX", NULL, NULL } Corega FastEther PCC-TX 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 NAKAGAWAMETAL LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } NAKAGAWA METAL LNT-10TN NE2000 Compatible Card +product EPSON EEN10B { "Seiko&spEpson&spCorp.", "Ethernet", "P/N:&spEEN10B&spRev.&sp00", NULL } Epson EEN10B +product EXP EXPMULTIMEDIA { "EXP&sp&sp&sp", "PnPIDE", "F1", NULL } EXP IDE/ATAPI DVD Card +product AMD AM79C930 { "AMD", "Am79C930", NULL, NULL } AMD Am79C930 +product ICOM SL200 { "Icom", "SL-200", NULL, NULL } Icom SL-200 +product XIRCOM CFE_10 { "Xircom", "CompactCard&spEthernet", "CFE-10", "1.00" } Xircom CompactCard CFE-10 +product BILLIONTON LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } Billionton Systems Inc. LNT-10TN NE2000 Compatible Card product AMBICOM AMB8002T { "AmbiCom&spInc", "AMB8002T", NULL, NULL } AmbiCom AMB8002T product IODATA PCLAT { "I-O&spDATA", "PCLA", "ETHERNET", NULL } IO-DATA PCLA/T -- cgit v1.1