patch-2.4.0-test3 linux/drivers/pci/pci.ids

Next file: linux/drivers/pcmcia/cs.c
Previous file: linux/drivers/parport/share.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/pci/pci.ids linux/drivers/pci/pci.ids
@@ -4,7 +4,7 @@
 #	Maintained by Martin Mares <pci-ids@ucw.cz>
 #	If you have any new entries, send them to the maintainer.
 #
-#	$Id: pci.ids,v 1.60 2000/05/01 19:53:05 mj Exp $
+#	$Id: pci.ids,v 1.62 2000/06/28 10:56:36 mj Exp $
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -406,6 +406,7 @@
 		1014 0143 Yotta Input Controller (ytin)
 	0144  Yotta Video Compositor Output
 		1014 0145 Yotta Output Controller (ytout)
+	0156  405GP PLB to PCI Bridge
 	ffff  MPIC-2 interrupt controller
 1015  LSI Logic Corp of Canada
 1016  ICL Personal Systems
@@ -570,6 +571,10 @@
 	0001  PowerEdge Expandable RAID Controller 2/Si
 	0002  PowerEdge Expandable RAID Controller 3/Di
 	0003  PowerEdge Expandable RAID Controller 3/Si
+	0004  PowerEdge Expandable RAID Controller 3/Si
+	0005  PowerEdge Expandable RAID Controller 3/Di
+	0006  PowerEdge Expandable RAID Controller 3/Di
+	0008  PowerEdge Expandable RAID Controller 3/Di
 1029  Siemens Nixdorf IS
 102a  LSI Logic
 	0000  HYDRA
@@ -919,6 +924,7 @@
 	8009  CXD1947Q i.LINK Controller
 	8039  CXD3222 i.LINK Controller
 	8056  Rockwell HCF 56K modem
+	808a  Memory Stick Controller
 104e  Oak Technology, Inc
 	0017  OTI-64017
 	0107  OTI-107 [Spitfire]
@@ -1250,6 +1256,7 @@
 	036c  Bt879(??) Video Capture
 		13e9 0070  Win/TV (Video Section)
 	036e  Bt878
+		0070 13eb  WinTV/GO
 		127a 0001  Bt878 Mediastream Controller NTSC
 		127a 0002  Bt878 Mediastream Controller PAL BG
 		127a 0003  Bt878a Mediastream Controller PAL BG
@@ -1297,6 +1304,7 @@
 		1851 1851  FlyVideo'98 EZ - video
 		1852 1852  FlyVideo'98 (with FM Tuner)
 	0878  Bt878
+		0070 13eb  WinTV/GO
 		127a 0001  Bt878 Video Capture (Audio Section)
 		127a 0002  Bt878 Video Capture (Audio Section)
 		127a 0003  Bt878 Video Capture (Audio Section)
@@ -1461,8 +1469,6 @@
 	5055  3c555 Laptop Hurricane
 	5057  3c575 [Megahertz] 10/100 LAN CardBus
 		10b7 5a57  3C575 Megahertz 10/100 LAN Cardbus PC Card
-	5b57  3c575 [Megahertz] 10/100 LAN CardBus
-		10b7 5a57  3C575 Megahertz 10/100 LAN Cardbus
 	5157  3c575 [Megahertz] 10/100 LAN CardBus
 		10b7 5b57  3C575 Megahertz 10/100 LAN Cardbus PC Card
 	5257  3CCFE575CT Cyclone CardBus
@@ -1472,9 +1478,11 @@
 	5951  3c595 100BaseT4 [Vortex]
 	5952  3c595 100Base-MII [Vortex]
 	5970  3c597 EISA Fast Demon/Vortex
+	5b57  3c595 [Megahertz] 10/100 LAN CardBus
+		10b7 5b57  3C575 Megahertz 10/100 LAN Cardbus PC Card
 	6560  3CCFE656 Cyclone CardBus
-	6562  3CCFEM656 Cyclone CardBus
-	6564  3CCFEM656 Cyclone CardBus (0x6564)
+	6562  3CCFEM656 [id 6562] Cyclone CardBus
+	6564  3CCFEM656 [id 6564] Cyclone CardBus
 	7646  3cSOHO100-TX Hurricane
 	8811  Token ring
 	9000  3c900 10BaseT [Boomerang]
@@ -1509,14 +1517,15 @@
 		1028 0098  3C905B Fast Etherlink XL 10/100
 		1028 0099  3C905B Fast Etherlink XL 10/100
 		10b7 9055  3C905B Fast Etherlink XL 10/100
+	9056  3c905B-T4
 	9058  3c905B-Combo [Deluxe Etherlink XL 10/100]
 	905a  3c905B-FX [Fast Etherlink XL FX 10/100]
 	9200  3c905C-TX [Fast Etherlink]
 		10b7 1000  3C905C-TX Fast Etherlink for PC Management NIC
 	9800  3c980-TX [Fast Etherlink XL Server Adapter]
 		10b7 9800  3c980-TX Fast Etherlink XL Server Adapter
-	9805  3c980-TX [10/100 Base-TX NIC(Python-T)]
-		10b7 9805  3c980 10/100 Base-TX NIC(Python-T)
+	9805  3c980-TX 10/100baseTX NIC [Python-T]
+		10b7 9805  3c980 10/100baseTX NIC [Python-T]
 10b8  Standard Microsystems Corp [SMC]
 	0005  83C170QF
 		1055 e000  LANEPIC
@@ -1683,6 +1692,7 @@
 	0010  Mutara V08 [NV2]
 	0020  Riva TnT 128 [NV04]
 		1043 0200  V3400 TNT
+		1048 0c18  Erazor II SGRAM
 		1092 0550  Viper V550
 		1092 0552  Viper V550
 		1092 4804  Viper V550 
@@ -1751,11 +1761,13 @@
 		1043 400a  AGP-V6800 DDR SGRAM
 		1043 400b  AGP-V6800 DDR SDRAM
 		1102 102e  CT6971 GeForce 256 DDR
+		14af 5021  3D Prophet DDR-DVI
 	0103  Quadro (GeForce 256 GL)
 	0110  NV11
 	0111  NV11 DDR
 	0113  NV11 GL
 	0150  NV15 (Geforce2 GTS)
+		107d 2840  WinFast GeForce2 GTS with TV output
 	0151  NV15 DDR (Geforce2 GTS)
 	0152  NV15 Bladerunner (Geforce2 GTS)
 	0153  NV15 GL (Quadro2)
@@ -2051,10 +2063,18 @@
 111a  Efficient Networks, Inc
 	0000  155P-MF1 (FPGA)
 	0002  155P-MF1 (ASIC)
-	0003  ENI-25P ATM Adapter
+	0003  ENI-25P ATM
 		111a 0000  ENI-25p Miniport ATM Adapter
-	0005  Speedstream 30xx ATM Adapter
-		111a 0001  SS-3010 Miniport ATM Adapter
+	0005  SpeedStream (LANAI)
+		111a 0001  ENI-3010 ATM
+		111a 0101  ENI-3010 ATM
+		111a 0009  ENI-3060 ADSL (VPI=0)
+		111a 0109  ENI-3060CO ADSL (VPI=0)
+		111a 0809  ENI-3060 ADSL (VPI=0 or 8)
+		111a 0909  ENI-3060CO ADSL (VPI=0 or 8)
+		111a 0a09  ENI-3060 ADSL (VPI=<0..15>)
+	0007  SpeedStream ADSL 
+		111a 1001  ENI-3061 ADSL [ASIC]
 111b  Teledyne Electronic Systems
 111c  Tricord Systems Inc.
 	0001  Powerbis Bridge
@@ -2114,7 +2134,7 @@
 		1133 e004  DIVA 2.0 U
 	e010  DIVA Server BRI-2M
 		1133 e010  DIVA Server BRI-2M
-	e014  DIVA Server PRO-30M
+	e014  DIVA Server PRI-30M
 		1133 e014  DIVA Server PRI-30M
 1134  Mercury Computer Systems
 	0001  Raceway Bridge
@@ -2281,7 +2301,8 @@
 	0008  CNB20HE
 	0009  CNB20LE
 	0010  CIOB30
-	0011  CMIC_HE
+	0011  CMIC-HE
+	0200  OSB4
 	0201  CSB5
 1167  Mutoh Industries Inc
 1168  Thine Electronics Inc
@@ -2422,7 +2443,7 @@
 		11ad f003  LNE100TX
 		11ad ffff  LNE100TX
 		1385 f004  FA310TX
-	c115  LNE100TX Fast Ethernet Adapter
+	c115  LNE100TX [Linksys EtherFast 10/100]
 11ae  Aztech System Ltd
 11af  Avid Technology Inc.
 11b0  V3 Semiconductor Inc.
@@ -2723,7 +2744,17 @@
 	1220  AMCC 5933 TMS320C80 DSP/Imaging board
 1221  Contec Co., Ltd
 1222  Ancor Communications, Inc.
-1223  Heurikon/Computer Products
+1223  Artesyn Communication Products
+	0003  PM/Link
+	0004  PM/T1
+	0005  PM/E1
+	0008  PM/SLS
+	0009  BajaSpan Resource Target
+	000a  BajaSpan Section 0
+	000b  BajaSpan Section 1
+	000c  BajaSpan Section 2
+	000d  BajaSpan Section 3
+	000e  PM/PPC
 1224  Interactive Images
 1225  Power I/O, Inc.
 1227  Tech-Source
@@ -4506,25 +4537,25 @@
 	1a21  82840 840 (Carmel) Chipset Host Bridge (Hub A)
 	1a23  82840 840 (Carmel) Chipset AGP Bridge
 	1a24  82840 840 (Carmel) Chipset PCI Bridge (Hub B)
-	2410  82801AA 82810 Chipset ISA Bridge (LPC)
-	2411  82801AA 82810 Chipset IDE
-	2412  82801AA 82810 Chipset USB
-	2413  82801AA 82810 Chipset SMBus
-	2415  82801AA 82810 AC'97 Audio
+	2410  82801AA ISA Bridge (LPC)
+	2411  82801AA IDE
+	2412  82801AA USB
+	2413  82801AA SMBus
+	2415  82801AA AC'97 Audio
 		11d4 0040  SoundMAX Integrated Digital Audio
 		11d4 0048  SoundMAX Integrated Digital Audio
 		11d4 5340  SoundMAX Integrated Digital Audio
-	2416  82801AA 82810 AC'97 Modem
-	2418  82801AA 82810 PCI Bridge
-	2420  82801AB 82810 Chipset ISA Bridge (LPC)
-	2421  82801AB 82810 Chipset IDE
-	2422  82801AB 82810 Chipset USB
-	2423  82801AB 82810 Chipset SMBus
-	2425  82801AB 82810 AC'97 Audio
+	2416  82801AA AC'97 Modem
+	2418  82801AA PCI Bridge
+	2420  82801AB ISA Bridge (LPC)
+	2421  82801AB IDE
+	2422  82801AB USB
+	2423  82801AB SMBus
+	2425  82801AB AC'97 Audio
 		11d4 0040  SoundMAX Integrated Digital Audio
 		11d4 0048  SoundMAX Integrated Digital Audio
-	2426  82801AB 82810 AC'97 Modem
-	2428  82801AB 82810 PCI Bridge
+	2426  82801AB AC'97 Modem
+	2428  82801AB PCI Bridge
 	2440  82820 820 (Camino 2) Chipset ISA Bridge (ICH2)
 	2442  82820 820 (Camino 2) Chipset USB (Hub A)
 	2443  82820 820 (Camino 2) Chipset SMBus
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)