- add new vendor ids for Pacific Data and Vitesse Semiconductor.

- change 3Com GIG to 3Com 3c940B.
- add SATA controllers from Acer Labs, Marvell, NVidia, Pacific Data,
  Via, and Vitesse.
- add and update wireless ids from Marvell.

1 files changed, 32 insertions, 6 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 12b4e3c5d4a..eeead7e8243 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.943 2005/10/15 15:46:41 brad Exp $
+$OpenBSD: pcidevs,v 1.944 2005/10/15 22:40:48 brad Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -240,8 +240,9 @@ vendor	SYMBOL		0x1562	Symbol
 vendor	SYBA		0x1592	Syba
 vendor	BLUESTEEL	0x15ab	Bluesteel
 vendor	VMWARE		0x15ad	VMware
-vendor	NDC		0x15e8	National Datacomm
 vendor	ZOLTRIX		0x15b0	Zoltrix
+vendor	NDC		0x15e8	National Datacomm
+vendor	PDC		0x15e9	Pacific Data
 vendor	EUMITCOM	0x1638	Eumitcom
 vendor	NETSEC		0x1660	NetSec
 vendor	ZYDAS		0x167b	ZyDAS Technology
@@ -250,6 +251,7 @@ vendor	ATHEROS		0x168c	Atheros
 vendor	GLOBALSUN	0x16ab	Global Sun
 vendor	SAFENET		0x16ae	SafeNet
 vendor	USR2		0x16ec	US Robotics
+vendor	VITESSE		0x1725	Vitesse
 vendor	LINKSYS		0x1737	Linksys
 vendor	NETOCTAVE	0x170b	Netoctave
 vendor	ALTIMA		0x173b	Altima
@@ -332,7 +334,7 @@ product 3COM 3CCFEM656C		0x6564	3CCFEM656C
 product 3COM GLOBALMODEM56	0x6565	56k Global Modem
 product 3COM 3CSOHO100TX	0x7646	3cSOHO-TX
 product 3COM 3CRWE777A		0x7770	3crwe777a AirConnect
-product 3COM GIG		0x80eb	Gig
+product 3COM 3C940B		0x80eb	3c940B
 product 3COM 3C900TPO		0x9000	3c900 10Base-T
 product 3COM 3C900COMBO		0x9001	3c900 10Mbps-Combo
 product 3COM 3C900B		0x9004	3c900B 10Mbps
@@ -451,6 +453,9 @@ product ALI M5229		0x5229	M5229 UDMA IDE
 product ALI M5237		0x5237	M5237 USB
 product ALI M5247		0x5247	M5247 AGP/PCI-PCI
 product ALI M5243		0x5243	M5243 AGP/PCI-PCI
+product ALI M5281		0x5281	M5281 SATA
+product ALI M5287		0x5287	M5287 SATA
+product ALI M5289		0x5289	M5289 SATA
 product ALI M5451		0x5451	M5451 Audio
 product ALI M5457		0x5457	M5457 Modem
 product ALI M7101		0x7101	M7101 Power
@@ -1893,8 +1898,11 @@ product MADGE COLLAGE155	0x1001	Collage 155 ATM
 product MARTINMARIETTA I740	0x00d1	i740 PCI
 
 /* Marvell products */
-product MARVELL 88W8310_1	0x1fa6	Libertas 88W8310
-product MARVELL 88W8310_2	0x1fa7	Libertas 88W8310
+product MARVELL 88W8300_1	0x1fa6	Libertas 88W8300
+product MARVELL 88W8310		0x1fa7	Libertas 88W8310
+product MARVELL 88W8335_1	0x1faa	Libertas 88W8335
+product MARVELL 88W8335_2	0x1fab	Libertas 88W8335
+product MARVELL	88W8300_2	0x2a01	Libertas 88W8300
 product MARVELL SK_V2		0x4320	SKv2
 product MARVELL YUKON_1		0x4340	Yukon
 product MARVELL YUKON_2		0x4341	Yukon
@@ -1912,6 +1920,12 @@ product MARVELL YUKON_8050	0x4361	Yukon 8050
 product MARVELL YUKON_8053	0x4362	Yukon 8053
 product MARVELL YUKON_10	0x4363	Yukon
 product MARVELL SK_V2_BELKIN	0x5005	Belkin F5D5005
+product MARVELL MV88SX5040	0x5040	MV88SX5040 SATA
+product MARVELL MV88SX5041	0x5041	MV88SX5041 SATA
+product MARVELL MV88SX5080	0x5080	MV88SX5080 SATA
+product MARVELL MV88SX5081	0x5081	MV88SX5081 SATA
+product MARVELL MV88SX6041	0x6041	MV88SX6041 SATA
+product MARVELL MV88SX6081	0x6081	MV88SX6041 SATA
 
 /* Matrox products */
 product MATROX ATLAS		0x0518	MGA PX2085 (Atlas)
@@ -2156,8 +2170,10 @@ product NVIDIA RIVA_TNT2	0x0028	Riva TNT2
 product NVIDIA RIVA_TNT2_ULTRA	0x0029	Riva TNT2 Ultra
 product NVIDIA VANTA1		0x002c	Vanta
 product NVIDIA VANTA2		0x002d	Vanta
+product NVIDIA MCP04_SATA	0x0036	MCP04 SATA
 product NVIDIA MCP04_LAN1	0x0037	MCP04 LAN
 product NVIDIA MCP04_LAN2	0x0038	MCP04 LAN
+product NVIDIA MCP04_SATA2	0x003e	MCP04 SATA
 product NVIDIA NFORCE4_ISA	0x0050	nForce4 ISA
 product NVIDIA NFORCE4_ISA2	0x0051	nForce4 ISA
 product NVIDIA NFORCE4_SMBUS	0x0052	nForce4 SMBus
@@ -2217,6 +2233,7 @@ product NVIDIA NFORCE3_250_USB	0x00e7	nForce3 250 USB
 product NVIDIA NFORCE3_250_USB2	0x00e8	nForce3 250 USB2
 product NVIDIA NFORCE3_250_ACA	0x00ea	nForce3 250 AC97
 product NVIDIA NFORCE3_250_PPB	0x00ed	nForce3 250 PCI-PCI
+product NVIDIA NFORCE3_250_SATA2	0x00ee	nForce3 250 SATA
 product NVIDIA GEFORCE6600GTAGP	0x00f1	GeForce 6600 GT AGP
 product NVIDIA QUADROFX330	0x00fd	Quadro FX 330
 product NVIDIA GEFORCE256	0x0100	GeForce256
@@ -2285,6 +2302,8 @@ product NVIDIA GEFORCE4TI4200	0x0253	GeForce4 Ti 4200
 product NVIDIA QUADRO4900XGL	0x0258	Quadro4 900 XGL
 product NVIDIA QUADRO4750XGL	0x0259	Quadro4 750 XGL
 product NVIDIA QUADRO4700XGL	0x025B	Quadro4 700 XGL
+product NVIDIA MCP51_SATA	0x0266	MCP51 SATA
+product NVIDIA MCP51_SATA2	0x0267	MCP51 SATA
 product NVIDIA GEFORCE4TI4200GO 0x0286	GeForce4 Ti 4200 Go
 product NVIDIA GEFORCEFX5800_U	0x0301	GeForce FX 5800 Ultra
 product NVIDIA GEFORCEFX5800	0x0302	GeForce FX 5800
@@ -2340,6 +2359,9 @@ product OXFORD VSCOM_PCI800H_1	0xa004	800H
 product OXFORD2 VSCOM_PCI011H	0x8403	011H
 product OXFORD2 EXSYS_EX41098	0x9511	Exsys EX-41098
 
+/* Pacific Data products */
+product PDC QSTOR_SATA		0x2068	QStor SATA
+
 /* Packet Engines products */
 product PE GNIC2		0x0911	PMC/GNIC2
 
@@ -2950,7 +2972,7 @@ product VIATECH CLE266		0x3122	CLE266
 product VIATECH VT8623		0x3123	VT8623 PCI
 product VIATECH VT8233_ISA	0x3147	VT8233 ISA
 product VIATECH VT8751		0x3148	VT8751 PCI
-product VIATECH VT8237_SATA	0x3149	VT8237 SATA
+product VIATECH VT6420_SATA	0x3149	VT6420 SATA
 product VIATECH VT8235_ISA	0x3177	VT8235 ISA
 product VIATECH K8HTB		0x3188	K8HTB Host
 product VIATECH VT8377		0x3189	VT8377 PCI
@@ -2958,6 +2980,7 @@ product VIATECH K8M400          0x3204  K8M400 Host
 product VIATECH VT8378          0x3205  VT8378 PCI
 product VIATECH VT8237_ISA	0x3227	VT8237 ISA
 product VIATECH K8T890_3	0x3238	K8T890 Host
+product VIATECH VT6421_SATA	0x3249	VT6421 SATA
 product VIATECH PM800_DRAM      0x3259  PM800 DRAM
 product VIATECH K8HTB_3		0x3282	K8HTB Host
 product VIATECH K8T890_4	0x4238	K8T890 Host
@@ -2988,6 +3011,9 @@ product VIATECH K8T890_PPB_C	0xc238	K8T390 PCI-PCI
 product VIATECH K8T890_PPB_D	0xd238	K8T390 PCI-PCI
 product VIATECH K8T890_PPB_E	0xe238	K8T390 PCI-PCI
 
+/* Vitesse Semiconductor products */
+product VITESSE VSC_7174	0x7174	VSC-7174 SATA
+
 /* Vortex Computer Systems products */
 product VORTEX GDT_60x0		0x0000	GDT6000/6020/6050
 product VORTEX GDT_6000B	0x0001	GDT6000B/6010