system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-21 15:54:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from NetBSD's pcmciadev file (rev ~1.208 - 1.226) where

Browse source 
appropriate (versions not appropriate to merge omitted):
o 1.226 imp nop, save for NetBSD string (minor merging the other way)
o 1.225 jnemeth Coreage LAPCCTXD
o 1.224 martin (remove 3rd and 4th clauses)
o 1.223 kiyohara (TDK bluetooth PC Card)
o 1.222 kiyohara (Anycom BlueCard)
o 1.221 ichiro (NEC Infrontia AX420N)
o 1.219 jmcneill (EDIMAX EP-4101)
o 1.213 tsutsui (TEAC IDECARDII entry fix)

Also, while I'm here, fix some tab problems that have crept in.
This commit is contained in:
Warner Losh 2008-07-06 06:17:39 +00:00
parent 847ea26fbb
commit b98165b03f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=180314
1 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sys/dev/pccard/pccarddevs
View file

@ -1,5 +1,5 @@
$FreeBSD$
/* $NetBSD: pcmciadevs,v 1.186 2003/09/16 08:26:37 onoe Exp $ */
/* $NetBSD: pcmciadevs,v 1.226 2008/06/19 18:20:33 imp Exp $ */
/* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */
/*-
@ -17,13 +17,6 @@ $FreeBSD$
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@ -153,6 +146,7 @@ vendor SYMBOL 0x026c Symbol
vendor BUFFALO 0x026f BUFFALO (Melco Corporation)
vendor BROMAX 0x0274 Bromax communications, Inc
vendor IODATA2 0x028a I-O DATA
vendor NECINFORTIA 0x0288 NEC Inforntia
vendor ASUS 0x02aa ASUS
vendor SIEMENS 0x02ac Siemens
vendor UNGERMANN 0x02c0 Ungermann Bass
@ -244,6 +238,7 @@ product ALLIEDTELESIS LA_PCM 0x0002 Allied Telesis LA-PCM
/* Anycom */
product ANYCOM LSE041 0x0004 AnyCom BlueCard LSE041 R1B
product ANYCOM LSE039 0x0008 Anycom Bluetooth CF Card LSE039
product ANYCOM LSE139 0x000b Anycom Bluetooth CF Card LSE139
/* Archos */
product ARCHOS ARC_ATAPI 0x0043 MiniCD
@ -314,6 +309,7 @@ product DUAL NE2000 0x0100 Dual NE2000
/* Edimax Products */
product EDIMAX EP4000A 0x0100 Edimax EP4000A
product EDIMAX EP4101 0x1090 Edimax EP4101
/* ELSA Products */
product ELSA MC2_IEEE 0x0001 AirLancer MC-2 IEEE
@ -429,6 +425,9 @@ product MOTOROLA PM100C 0x0302 Motorola Personal Messenger 100C CDPD Modem
product MOTOROLA MARINER 0x0501 Motorola Mariner Ethernet/Modem
product MOTOROLA MONTANA_336 0x0505 Motorola Montana 33.6
/* NEC Inforntia Products */
product NECINFRONTIA AX420N 0x1b01 NEC Infrontia AX420N AirH Modem
/* New Media Products */
product NEWMEDIA BASICS 0x0019 New Media BASICS Ethernet
product NEWMEDIA LANSURFER 0x0021 New Media LANSurfer
@ -580,6 +579,7 @@ product SOCKET ES_1000 0x000a Socket Communications Ethernet/RS-232
product SOCKET LP_ETHER 0x000d Socket Communications LP-E
product SOCKET DUAL_IO 0x0070 Socket Communications DUAL IO
product SOCKET LP_ETHER_CF 0x0075 Socket Communications LP-E CF
product SOCKET DUAL_RS232_A 0x00a1 Socket Communications Dual RS232_A
product SOCKET LP_ETH_10_100_CF 0x0145 Socket Communications 10/100 Ethernet
/* Symbol */
@ -592,6 +592,7 @@ 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
product TDK BLUETOOTH 0x4254 TDK Bluetooth PC Card
product TDK GN3410 0x4815 TDK GlobalNetworker 3410
product TDK LAK_CD031 0xc1ab TDK LAK-CD031 Ethernet
product TDK DFL5610WS 0xea15 TDK DFL5610WS Ethernet/Modem
@ -690,6 +691,8 @@ product COREGA ETHER_II_PCC_TD { "corega&spK.K.", "corega&spEtherII&spPCC-TD", N
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_TXF { "corega", "FEther&spPCC-TXF", NULL, NULL } Corega FEther PCC-TXF
product COREGA FETHER_II_PCC_TXD { "corega&spK.K.", "corega&spFEtherII&spPCC-TXD", NULL, NULL } Corega FEtherII PCC-TXD
product COREGA LAPCCTXD { "corega&spK.K.", "(CG-LAPCCTXD)", "(HardwareFirmwareVer.)", NULL } Corega LAPCCTXD
product COREGA WIRELESS_LAN_PCC_11 { "corega&spK.K.", "Wireless&spLAN&spPCC-11", NULL, NULL } Corega Wireless LAN PCC-11
product COREGA WIRELESS_LAN_PCCA_11 { "corega&spK.K.", "Wireless&spLAN&spPCCA-11", NULL, NULL } Corega Wireless LAN PCCA-11
product COREGA WIRELESS_LAN_PCCB_11 { "corega_K.K.", "Wireless_LAN_PCCB-11", NULL, NULL } Corega Wireless LAN PCCB-11
@ -759,7 +762,7 @@ product SMC 8020BTM { "SMC", "EtherEZ&spEthernet/Modem", "8020", NULL }
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
product TAMARACK ETHERNET { "TAMARACK", "Ethernet", NULL, NULL } TAMARACK NE2000 PC Card
product TEAC IDECARDII { NULL, "NinjaATA-", NULL, NULL } TEAC IDE Card/II
product TEAC IDECARDII { "&sp", "NinjaATA-", NULL, NULL } TEAC IDE Card/II
product TOSHIBA CBIDE2 { "LOOKMEET", "CBIDE2&sp&sp&sp&sp&sp&sp", NULL, NULL } TOSHIBA PA2673U CBIDE2/16-bit mode (IO-DATA OEM)
product WORKBIT2 NINJA_SCSI3 { "WBT", "NinjaSCSI-3", NULL, NULL } WORKBIT Ninja SCSI series
product YEDATA EXTERNAL_FDD { "Y-E&spDATA", "External&spFDD", NULL, NULL } Y-E DATA External FDD