From 4f1541715c26b794a42cddaa21e2f22d261373b7 Mon Sep 17 00:00:00 2001 From: imp Date: Thu, 24 Aug 2000 07:01:12 +0000 Subject: o Fix unterminated comment o Sync to NetBSD (rev NetBSD-user edited-log): 1.97 onoe add Samsung MagicLAN SWL-2000N 1.96 gmcgarry Add entries for all Xircom ethernet models. 1.95 onoe Add Farallon SkyLINE 11mb card as Intersil Prism2 [...] 1.94 joda add 3Com 3CRWE737A (AirConnect) 1.93 soren Include vendor name for IBM products. 1.92 onoe Add Farallon SkyLINE Wireless LAN Card for awi(4) [...] 1.91 soren Add Olicom GoCard. 1.90 gmcgarry Clean up XIRCOM entries - Add entry for Xircom CreditCard Ethernet + Modem 28 - Add entry for Intel EtherExpress PRO/100 - Add entry for Compaq Netelligent 10/100 Ethernet 1.89 is RATOC REX-R280 (another if_mbe_pcmcia card) support by [...] 1.88 joda Panasonic KXLC003 1.87 scw [...] SOHOware PCMCIA Ethernet card, model ND5100-E [...] 1.86 itojun add CIS for Corega Wireless LAN PCC-11 [...] o Minor diffs between the two files corrected to aid future sync. --- sys/dev/pccard/pccarddevs | 81 +++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 28 deletions(-) (limited to 'sys/dev/pccard') diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs index 8affabc..ba1fdb4 100644 --- a/sys/dev/pccard/pccarddevs +++ b/sys/dev/pccard/pccarddevs @@ -1,5 +1,5 @@ $FreeBSD$ -/* $NetBSD: pcmciadevs,v 1.85 2000/03/22 21:39:57 mycroft Exp $ +/* $NetBSD: pcmciadevs,v 1.97 2000/07/26 07:24:15 onoe Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -44,8 +44,8 @@ $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 +vendor NEWMEDIA 0x0057 New Media Corporation +vendor INTEL 0x0089 Intel vendor IBM 0x00a4 IBM Corporation vendor MOTOROLA 0x0109 Motorola Corporation vendor 3COM 0x0101 3Com Corporation @@ -56,6 +56,7 @@ vendor XIRCOM 0x0105 Xircom vendor SMC 0x0108 Standard Microsystems Corporation vendor USROBOTICS 0x0115 US Robotics Corporation vendor MEGAHERTZ2 0x0128 Megahertz Corporation +vendor OLICOM 0x0121 Olicom vendor ADAPTEC 0x012f Adaptec Corporation vendor COMPAQ 0x0138 Compaq vendor LINKSYS 0x0149 Linksys Corporation @@ -67,7 +68,9 @@ vendor DAYNA 0x0194 Dayna Corporation vendor RAYTHEON 0x01a6 Raytheon vendor IODATA 0x01bf I-O DATA vendor BAY 0x01eb Bay Networks +vendor FARALLON 0x0200 Farallon Communications vendor NOKIA 0x023d Nokia Communications +vendor SAMSUNG 0x0250 Samsung vendor LASAT 0x3401 Lasat Communications A/S vendor LEXARMEDIA 0x4e01 Lexar Media vendor COMPEX 0x8a01 Compex Corporation @@ -83,10 +86,11 @@ vendor RATOC 0xc015 RATOC System Inc. */ /* Adaptec Products */ -product ADAPTEC APA1460_1 0x0001 Adaptec APA-1460/A SCSI Host Adapter -product ADAPTEC APA1460_2 0x0002 Adaptec APA-1460/B SCSI Host Adapter +product ADAPTEC APA1460 0x0001 Adaptec APA-1460 SlimSCSI +product ADAPTEC APA1460A 0x0002 Adaptec APA-1460A SlimSCSI /* 3COM Products */ +product 3COM 3CRWE737A 0x0001 3Com AirConnect Wireless LAN 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 @@ -96,6 +100,9 @@ product 3COM 3CXEM556 0x0035 3Com/Megahertz 3CXEM556 Ethernet/Modem product 3COM 3CXEM556INT 0x003d 3Com/Megahertz 3CXEM556-INT Ethernet/Modem product 3COM 3CCFEM556BI 0x0556 3Com/Megahertz 3CCFEM556BI Ethernet/Modem +/* Compaq Products */ +product COMPAQ2 CPQ_10_100 0x010a Compaq Netelligent 10/100 Ethernet + /* Compex Products */ product COMPEX LINKPORT_ENET_B 0x0100 Compex Linkport ENET-B Ethernet @@ -121,18 +128,24 @@ product FUJITSU LA501 0x2000 Fujitsu Towa LA501 Ethernet product FUJITSU LA10S 0x1003 Fujitsu Compact Flash Ethernet /* IBM Products */ -product IBM 3270 0x0001 3270 Emulation -product IBM INFOMOVER 0x0002 National Semiconductor InfoMover -product IBM 5250 0x000b 5250 Emulation -product IBM TROPIC 0x001e Token Ring 4/16 +product IBM 3270 0x0001 IBM 3270 Emulation +product IBM INFOMOVER 0x0002 IBM InfoMover +product IBM 5250 0x000b IBM 5250 Emulation +product IBM TROPIC 0x001e IBM Token Ring 4/16 +product IBM PORTABLE_CDROM 0x002d IBM PCMCIA Portable CD-ROM Drive product IBM HOME_AND_AWAY 0x002e IBM Home and Away Modem -product IBM WIRELESS_LAN_ENTRY 0x0032 Wireless LAN Entry -product IBM PORTABLE_CDROM 0x002d PCMCIA Portable CD-ROM Drive +product IBM WIRELESS_LAN_ENTRY 0x0032 IBM Wireless LAN Entry product IBM ETHERJET 0x003f IBM EtherJet Ethernet +/* Intel Products */ +product INTEL EEPRO100 0x010a Intel EtherExpress PRO/100 + /* I-O DATA */ product IODATA PCLATE 0x2216 I-O DATA PCLA/TE +/* Farallon */ +product FARALLON SKYLINE 0x0a01 SkyLINE Wireless + /* Lexar Media */ product LEXARMEDIA COMPATFLASH 0x0100 Lexar Media CompactFlash @@ -155,8 +168,12 @@ product MELCO LPC3_TX 0xc1ab Melco LPC3-TX /* Nokia Products */ product NOKIA C020_WLAN 0x20c0 Nokia C020 WLAN Card +/* Olicom Products */ +product OLICOM TR 0x2132 GoCard Token Ring 16/4 + /* Panasonic Products */ product PANASONIC KXLC002 0x0304 Panasonic 4X CD-ROM Interface Card +product PANASONIC KXLC003 0x0504 Panasonic 8X CD-ROM Interface Card /* US Robotics Products */ product USROBOTICS WORLDPORT144 0x3330 US Robotics WorldPort 14.4 Modem @@ -177,19 +194,19 @@ product SOCEKT LP_ETHER_CF 0x0075 Socket Communications Low Power Ethernet CF /* TDK Products */ product TDK LAK_CD021BX 0x0200 TDK LAK-CD021BX Ethernet product TDK DFL9610 0x0d0a TDK DFL9610 Ethernet & Digital Cellular -product TDK LAK_CF010 0x0900 TDK LAC-CF010 - -/* TDK Vendor ID also used by Xircom! */ -product TDK XIR_CE_10 0x0108 Xircom CreditCard Ethernet -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 -/* 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) +product TDK LAK_CF010 0x0900 TDK LAC-CF010 + +/* Xircom Products */ +product XIRCOM CE 0x0108 Xircom CreditCard Ethernet +product XIRCOM CE2 0x010b Xircom CreditCard Ethernet II +product XIRCOM CE3 0x010a Xircom CreditCard 10/100 Ethernet +product XIRCOM CEM 0x110a Xircom CreditCard Ethernet + Modem +product XIRCOM CEM28 0x110b Xircom CreditCard Ethernet + Modem 28 +product XIRCOM CEM33 0x110b Xircom CreditCard Ethernet + Modem 33 +product XIRCOM CEM56 0x110b Xircom CreditCard Ethernet + Modem 56 +product XIRCOM REM56 0x110a Xircom RealPort Ethernet 10/100 + Modem 56 +product XIRCOM CNW_801 0x0801 Xircom CreditCard Netwave (Canada) +product XIRCOM CNW_802 0x0802 Xircom CreditCard Netwave (US) /* New Media Products */ product NEWMEDIA BASICS 0x0019 New Media BASICS Ethernet @@ -223,6 +240,12 @@ product BAY STACK_660 0x0807 BayStack 660 Wireless LAN /* Raylink/WebGear */ product RAYTHEON WLAN 0x0000 WLAN Adapter +/* RATOC System Inc. Products */ +product RATOC REX_R280 0x1 RATOC REX-R280 + +/* Samsung */ +product SAMSUNG SWL_2000N 0x02 Samsung MagicLAN SWL-2000N + /* Cards we know only by their cis */ vendor PREMAX -1 Premax vendor PLANET -1 Planet @@ -241,6 +264,7 @@ vendor EXP -1 EXP Computer Inc vendor ICOM -1 ICOM Inc vendor BILLIONTON -1 Billionton Systems Inc. vendor AMD -1 AMD +vendor INTERSIL -1 Intersil 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 @@ -263,6 +287,7 @@ 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 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 COREGA WIRELESS_LAN_PCC_11 { "corega&spK.K.", "Wireless&spLAN&spPCC-11", NULL, NULL } Corega Wireless LAN PCC-11 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 /* @@ -270,14 +295,14 @@ product SVEC LANCARD { "SVEC", "FD605&spPCMCIA&spEtherNet&spCard", "V1-1", NULL * 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 AMBICOM AMB8002T { "AmbiCom&spInc", "AMB8002T", NULL, NULL } AmbiCom AMB8002T +product IODATA PCLAT { "I-O&spDATA", "PCLA", "ETHERNET", NULL } IO-DATA PCLA/T 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 +product NDC ND5100_E { "NDC", "Ethernet", "A", NULL } Sohoware ND5100E NE2000 Compatible Card +product INTERSIL PRISM2 { "INTERSIL", "HFA384x/IEEE", "Version 01.02", NULL} Intersil Prism II -- cgit v1.1