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

Merge from both NetBSD and OpenBSD's pcmciadevs:

Browse Source 
NetBSD:
	1.163; martin; ELSA MicroLink mc all
	1.162; is; typo
	1.161; is; typo
	1.160; is; Add Lantech Fastnet/TX
OpenBSD:
	1.85; millert; proxim rangelan-ds
	1.84; provos; linksys wpc11
	1.83; mickey; now wires needed wlan
	1.82; mickey; socket low power wlan from netbsd [*]
	1.81; mickey; ericsson wlan
	1.80; fgsch; add openbsd tag back (not needed)
	1.79; fgsch; Netgear FA411
	1.78; mickey; simple spectrum25 from netbsd [*]
	1.77; mickey; emtac wavelan from netbsd [*]
	1.76; mickey; buffalo wavelans from netbsd [*]
	1.75; jakob; 3com wilress lan pccard
	1.74; mickey; linksys2 instant wireless
	1.73; mickey; oops (add closing quote)
	1.72; mickey; pcm100
[*] (already in freebsd)

Obtained from: NetBSD, OpenBSD
This commit is contained in:
imp 2002-04-02 05:39:07 +00:00
parent 77d2456ccb
commit df2847c093
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/pccard/pccarddevs
View File

@ -1,6 +1,6 @@
$FreeBSD$
/* $NetBSD: pcmciadevs,v 1.159 2002/01/28 09:25:33 aymeric Exp $ */
/* $OpenBSD: pcmciadevs,v 1.71 2001/10/28 19:21:37 mickey Exp $ */
/* $NetBSD: pcmciadevs,v 1.163 2002/03/04 16:41:50 martin Exp $ */
/* $OpenBSD: pcmciadevs,v 1.85 2002/03/29 18:54:07 millert Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -87,6 +87,7 @@ vendor SYMBOL 0x026c Symbol
vendor BUFFALO 0x026f BUFFALO (Melco Corporation)
vendor LINKSYS2 0x0274 The Linksys Group
vendor IODATA2 0x028a I-O DATA
vendor NWN 0x0602 No Wires Needed
vendor BREEZECOM 0x0a02 BreezeCOM
vendor NEWMEDIA2 0x10cd NewMedia
vendor LASAT 0x3401 Lasat Communications A/S
@ -241,6 +242,7 @@ 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 LINKSYS2 IWN 0x1612 Instant Wireless Network PC Card
product LINKSYS2 IWN2 0x1613 Instant Wireless Network PC Card
/* Lucent WaveLAN/IEEE */
product LUCENT WAVELAN_IEEE 0x0002 WaveLAN/IEEE
@ -275,6 +277,7 @@ product NEWMEDIA2 BUSTOASTER 0x0001 NewMedia BusToaster
/* Netgear */
product NETGEAR FA410TXC 0x4530 Netgear FA410TXC
product NETGEAR FA411 0x0411 Netgear FA411
/* National Instruments */
product NI PCMCIA_GPIB 0x4882 National Instruments PCMCIA-GPIB
@ -282,6 +285,10 @@ product NI PCMCIA_GPIB 0x4882 National Instruments PCMCIA-GPIB
/* Nokia Products */
product NOKIA C020_WLAN 0x20c0 Nokia C020 WLAN Card
/* No Wires Needed */
product NWN WLAN_550 0x0002 NWN 550 WLAN
product NWN WLAN_1148 0x0003 NWN 1148 WLAN
/* Olicom Products */
product OLICOM TR 0x2132 GoCard Token Ring 16/4
@ -341,6 +348,7 @@ product TDK LAK_CD011WL 0x0000 TDK LAK-CD011WL
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
product TDK C6500012 0x410a TDK ELSA MicroLink MC all
/* Telecom Device */
product TELECOMDEVICE TCD_HPC100 0x0202 Telecom Device TCD-HPC100
@ -381,6 +389,7 @@ vendor EXP -1 EXP Computer Inc
vendor GEMTEK -1 Gem Tek
vendor ICOM -1 ICOM Inc
vendor INTERSIL -1 Intersil
vendor LANTECH -1 Lantech Computer Company
vendor NAKAGAWAMETAL -1 NAKAGAWA METAL
vendor NDC -1 NDC
vendor PLANET -1 Planet
@ -419,12 +428,18 @@ product DLINK DE660PLUS { "D-Link", "DE-660+", NULL, NULL } D-Link DE-660+
product EIGERLABS EPX_AA2000 { "Eiger&splabs,Inc.", "EPX-AA2000&spPC&spSound&spCard", NULL, NULL } EPX-AA2000 PC Sound 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 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 GEMTEK WLAN { "Intersil", "PRISM&sp2_5&spPCMCIA&spADAPTER", "ISL37300P", "Eval-RevA" } GEMTEK Prism2_5 WaveLAN Card
product ICOM SL200 { "Icom", "SL-200", NULL, NULL } Icom SL-200
product INTERSIL PRISM2 { "INTERSIL", "HFA384x/IEEE", "Version&sp01.02", NULL } Intersil Prism II
product IODATA CBIDE2 { "IO&spDATA", "CBIDE2&sp&sp&sp&sp&sp&sp", NULL, NULL } IO-DATA CBIDE2/16-bit mode
product IODATA PCLAT { "I-O&spDATA", "PCLA", "ETHERNET", NULL } IO-DATA PCLA/T
product LANTECH FASTNETTX { "ASIX", "AX88190", NULL, NULL } Lantech Fastnet/TX
product LINKSYS ECARD_2 { "LINKSYS", "E-CARD", NULL, NULL } Linksys E-Card
product LINKSYS PCM100 { "Linksys", "EtherFast&sp10/100&spIntegrated&spPC&spCard&sp(PCM100)", "Ver&sp1.0", NULL }
product MEGAHERTZ XJ2288 { "MEGAHERTZ", "MODEM&spXJ2288", NULL, NULL } Megahertz XJ2288 Modem
product MELCO LPC2_TX { "MELCO", "LPC2-TX", NULL, NULL } Melco LPC2-TX
product NAKAGAWAMETAL LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } NAKAGAWA METAL LNT-10TN NE2000 Compatible Card
@ -456,7 +471,3 @@ product TEAC IDECARDII { NULL, "NinjaATA-", NULL, NULL } TEAC IDE Card/II
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 ZOOM AIR_4000 { "Zoom", "Air-4000", NULL, NULL } Zoom Air-4000
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