Module Name: src
Committed By: dsl
Date: Sat Dec 5 16:30:39 UTC 2009
Modified Files:
src/sys/dev/pci: pcidevs
Log Message:
Correct what are clearly typos leading to duplicate vendor:product pairs.
Where possible values have been checked against the pcidatabase and x.org.
In some cases I've only commented on some dubious entries!
Values will be picked up by the next update.
Info from PR/36487
To generate a diff of this commit:
cvs rdiff -u -r1.1003 -r1.1004 src/sys/dev/pci/pcidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1003 src/sys/dev/pci/pcidevs:1.1004
--- src/sys/dev/pci/pcidevs:1.1003 Mon Nov 30 09:31:11 2009
+++ src/sys/dev/pci/pcidevs Sat Dec 5 16:30:39 2009
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1003 2009/11/30 09:31:11 sborrill Exp $
+$NetBSD: pcidevs,v 1.1004 2009/12/05 16:30:39 dsl Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -770,7 +770,7 @@
product ALI M1531 0x1531 M1531 Host-PCI Bridge
product ALI M1533 0x1533 M1533 PCI-ISA Bridge
product ALI M1541 0x1541 M1541 Host-PCI Bridge
-product ALI M1543 0x1533 M1543 PCI-ISA Bridge
+product ALI M1543 0x1543 M1543 PCI-ISA Bridge
product ALI M1563 0x1563 M1563 PCI-ISA Bridge
product ALI M1689 0x1689 M1689 Host-PCI Bridge
product ALI M3309 0x3309 M3309 MPEG Decoder
@@ -1073,6 +1073,7 @@
product ATTANSIC ETHERNET_100 0x2048 L2 100 Mbit Ethernet Adapter
/* ATI products */
+/* See http://www.x.org/wiki/Radeon%20ASICs */
product ATI RADEON_RV380_3150 0x3150 Radeon Mobility X600 (M24) 3150
product ATI RADEON_RV380_3154 0x3154 FireGL M24 GL 3154
product ATI RADEON_RV380_3E50 0x3e50 Radeon X600 (RV380) 3E50
@@ -1092,6 +1093,7 @@
product ATI RADEON_RV360_AR 0x4152 Radeon 9600XT AR
product ATI RADEON_RV350_AS 0x4153 Radeon 9600 AS
product ATI RADEON_RV350_AT 0x4154 FireGL T2 AT
+/* RV350 and RV360 FireFL T2 have same PCI id */
product ATI RADEON_RV350_AV 0x4154 FireGL RV360 AV
product ATI MACH32 0x4158 Mach32
product ATI RADEON_9600_LE_S 0x4171 Radeon 9600 LE Secondary
@@ -1176,11 +1178,14 @@
product ATI RADEON_RV250_4967 0x4967 Radeon 9000 Ig
product ATI RADEON_R420_JH 0x4a48 Radeon X800 (R420) JH
product ATI RADEON_R420_JI 0x4a49 Radeon X800PRO (R420) JI
+/* XXX 4a4a is generic, the SE should be 4a4f */
product ATI RADEON_R420_JJ 0x4a4a Radeon X800SE (R420) JJ
+/* XXX 4a4b should be the XT */
product ATI RADEON_R420_JK 0x4a4b Radeon X800 (R420) JK
product ATI RADEON_R420_JL 0x4a4c Radeon X800 (R420) JL
product ATI RADEON_R420_JM 0x4a4d FireGL X3 (R420) JM
product ATI RADEON_R420_JN 0x4a4e Radeon Mobility 9800 (M18) JN
+/* Duplicate, maybe this entry should be 4a50, XT Platinum */
product ATI RADEON_R420_JP 0x4a4e Radeon X800XT (R420) JP
product ATI RAGE_LT_PRO_AGP 0x4c42 3D Rage LT Pro (AGP 133MHz)
product ATI RAGE_LT_PRO_AGP66 0x4c44 3D Rage LT Pro (AGP 66MHz)
@@ -3205,11 +3210,9 @@
product NVIDIA NFORCE3_250_MCPT_AC 0x00ea nForce3 250 MCP-T AC-97
product NVIDIA NFORCE3_250_PPB 0x00ed nForce3 250 PCI-PCI Bridge
product NVIDIA NFORCE3_250_SATA2 0x00ee nForce3 250 Serial ATA Controller
-product NVIDIA XBOX_SMBUS 0x01b4 Xbox nForce SMBus Controller
-product NVIDIA XBOX_PCHB 0x02a5 Xbox nForce Host-PCI Bridge
product NVIDIA ALADDINTNT2 0x00a0 Aladdin TNT2
product NVIDIA QUADRO4_280NVS2 0x00fd Quadro4 280 NVS
-product NVIDIA QUADROFX3400SLI 0x00fd Quadro FX 3400 SLI
+product NVIDIA QUADROFX3400SLI 0x00fe Quadro FX 3400 SLI
product NVIDIA GEFORCE256 0x0100 GeForce 256
product NVIDIA GEFORCEDDR 0x0101 GeForce DDR
product NVIDIA QUADRO 0x0103 Quadro
@@ -3237,6 +3240,7 @@
product NVIDIA QUADRO4_380XGL 0x018b Quadro4 380 XGL
product NVIDIA GEFORCE2_IGP 0x01a0 GeForce2 Integrated GPU
product NVIDIA NFORCE_MCP_AC 0x01b1 nForce MCP AC-97
+product NVIDIA XBOX_SMBUS 0x01b4 Xbox nForce SMBus Controller
product NVIDIA NFORCE_ATA100 0x01bc nForce ATA100 IDE
product NVIDIA NFORCE_USB 0x01c2 nForce USB
product NVIDIA NFORCE_LAN 0x01c3 nForce Ethernet
@@ -3278,6 +3282,8 @@
product NVIDIA GF4_TI_4200_GO 0x0286 GeForce4 Ti 4200 Go AGP 8x
product NVIDIA QUADRO4_980_XGL 0x0288 Quadro4 980 XGL
product NVIDIA QUADRO4_780_XGL 0x0289 Quadro4 780 XGL
+product NVIDIA XBOXFB 0x02a0 Xbox Frame Buffer
+product NVIDIA XBOX_PCHB 0x02a5 Xbox nForce Host-PCI Bridge
product NVIDIA C51_HB_02F0 0x02f0 C51 Host Bridge (0x02f0)
product NVIDIA C51_HB_02F1 0x02f1 C51 Host Bridge (0x02f1)
product NVIDIA C51_HB_02F2 0x02f2 C51 Host Bridge (0x02f2)
@@ -3295,7 +3301,6 @@
product NVIDIA C51_MC1 0x02fe C51 Memory Controller 1
product NVIDIA C51_HB_02FF 0x02ff C51 Host Bridge (0x02ff)
product NVIDIA GEFORCE_FX5800U 0x0301 GeForce FX 5800 Ultra
-product NVIDIA XBOXFB 0x02a0 Xbox Frame Buffer
product NVIDIA GEFORCE_FX5800 0x0302 GeForce FX 5800
product NVIDIA QUADRO_FX_2000 0x0308 Quadro FX 2000
product NVIDIA QUADRO_FX_1000 0x0309 Quadro FX 1000
@@ -3336,10 +3341,10 @@
product NVIDIA MCP61_PPB_2 0x03e9 nForce MCP61 PCI-PCI Bridge
product NVIDIA MCP61_SMB 0x03eb nForce MCP61 SMBus Controller
product NVIDIA MCP61_IDE 0x03ec nForce MCP61 ATA133 IDE Controller
-product NVIDIA MCP61_SATA2 0x03f6 nForce MCP61 Serial ATA Controller
-product NVIDIA MCP61_SATA3 0x03f7 nForce MCP61 Serial ATA Controller
product NVIDIA MCP61_LAN3 0x03ee nForce MCP61 Gigabit Ethernet Controller
product NVIDIA MCP61_LAN4 0x03ef nForce MCP61 Gigabit Ethernet Controller
+product NVIDIA MCP61_SATA2 0x03f6 nForce MCP61 Serial ATA Controller
+product NVIDIA MCP61_SATA3 0x03f7 nForce MCP61 Serial ATA Controller
product NVIDIA GF_8400M_GS 0x0427 GeForce 8400M GS
product NVIDIA QUADRO_NVS140M 0x0429 Quadro NVS 140M
product NVIDIA MCP65_ISA 0x0440 nForce MCP65 PCI-ISA Bridge
@@ -3634,7 +3639,8 @@
product S3 968_2 0x88f2 86C968-2 (\"Vision968\")
product S3 968_3 0x88f3 86C968-3 (\"Vision968\")
product S3 TRIO64V2_DX 0x8901 Trio64V2/DX
-product S3 PLATO_PX 0x8901 Plato/PX
+/* pcidatbase.com has this as 0x0551, I'd rather believe linux's 8902 */
+product S3 PLATO_PX 0x8902 Plato/PX
product S3 TRIO3D 0x8904 86C365 Trio3D
product S3 VIRGE_DX 0x8a01 ViRGE/DX
product S3 VIRGE_GX2 0x8a10 ViRGE/GX2
@@ -3733,7 +3739,7 @@
product SIIG CYBER10_S850 0x1002 Cyber10x Serial 16850 PCI
product SIIG CYBER10_IO550 0x1010 Cyber10x I/O 16550 PCI
product SIIG CYBER10_IO650 0x1011 Cyber10x I/O 16650 PCI
-product SIIG CYBER10_IO850 0x1010 Cyber10x I/O 16850 PCI
+product SIIG CYBER10_IO850 0x1012 Cyber10x I/O 16850 PCI
product SIIG CYBER10_P 0x1020 Cyber10x Parallel PCI
product SIIG CYBER10_2P 0x1021 Cyber10x Parallel Dual PCI
product SIIG CYBER10_2S550 0x1030 Cyber10x Serial Dual 16550 PCI
@@ -3750,7 +3756,7 @@
product SIIG CYBER20_S850 0x2002 Cyber20x Serial 16850 PCI
product SIIG CYBER20_IO550 0x2010 Cyber20x I/O 16550 PCI
product SIIG CYBER20_IO650 0x2011 Cyber20x I/O 16650 PCI
-product SIIG CYBER20_IO850 0x2010 Cyber20x I/O 16850 PCI
+product SIIG CYBER20_IO850 0x2012 Cyber20x I/O 16850 PCI
product SIIG CYBER20_P 0x2020 Cyber20x Parallel PCI
product SIIG CYBER20_2P 0x2021 Cyber20x Parallel Dual PCI
product SIIG CYBER20_2S550 0x2030 Cyber20x Serial Dual 16550 PCI
