Remove some duplicate NVIDIA entries and touch up some of the names

to make the naming more consistent.

1 files changed, 32 insertions, 31 deletions

diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 686a02272d3..fad095c01a9 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1410 2008/09/15 16:21:40 brad Exp $
+$OpenBSD: pcidevs,v 1.1411 2008/09/17 05:06:22 brad Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -3174,7 +3174,7 @@ product NVIDIA MCP04_OHCI	0x003b	MCP04 USB
 product NVIDIA MCP04_ECHI	0x003c	MCP04 USB
 product NVIDIA MCP04_PPB	0x003d	MCP04 PCI-PCI
 product NVIDIA MCP04_SATA2	0x003e	MCP04 SATA
-product NVIDIA NFORCE4_ISA	0x0050	nForce4 ISA
+product NVIDIA NFORCE4_ISA1	0x0050	nForce4 ISA
 product NVIDIA NFORCE4_ISA2	0x0051	nForce4 ISA
 product NVIDIA NFORCE4_SMB	0x0052	nForce4 SMBus
 product NVIDIA NFORCE4_ATA133	0x0053	nForce4 IDE
@@ -3183,8 +3183,8 @@ product NVIDIA NFORCE4_SATA2	0x0055	nForce4 SATA
 product NVIDIA CK804_LAN1	0x0056	CK804 LAN
 product NVIDIA CK804_LAN2	0x0057	CK804 LAN
 product NVIDIA NFORCE4_AC	0x0059	nForce4 AC97
-product NVIDIA NFORCE4_USB	0x005a	nForce4 USB
-product NVIDIA NFORCE4_USB2	0x005b	nForce4 USB
+product NVIDIA NFORCE4_OHCI	0x005a	nForce4 USB
+product NVIDIA NFORCE4_EHCI	0x005b	nForce4 USB
 product NVIDIA NFORCE4_PPB	0x005c	nForce4 PCI-PCI
 product NVIDIA NFORCE4_PPB2	0x005d	nForce4 PCIE
 product NVIDIA NFORCE4_MEM	0x005e	nForce4 DDR
@@ -3192,8 +3192,8 @@ product NVIDIA NFORCE2_ISA	0x0060	nForce2 ISA
 product NVIDIA NFORCE2_SMB	0x0064	nForce2 SMBus
 product NVIDIA NFORCE2_IDE	0x0065	nForce2 IDE
 product NVIDIA NFORCE2_LAN	0x0066	nForce2 LAN
-product NVIDIA NFORCE2_USB	0x0067	nForce2 USB
-product NVIDIA NFORCE2_USB2	0x0068	nForce2 USB
+product NVIDIA NFORCE2_OHCI	0x0067	nForce2 USB
+product NVIDIA NFORCE2_EHCI	0x0068	nForce2 USB
 product NVIDIA NFORCE2_ACA	0x006a	nForce2	AC97
 product NVIDIA NFORCE2_APU	0x006b	nForce2	Audio
 product NVIDIA NFORCE2_PPB	0x006c	nForce2 PCI-PCI
@@ -3204,8 +3204,8 @@ product NVIDIA NFORCE2_400_ISA	0x0080	nForce2 400 ISA
 product NVIDIA NFORCE2_400_SMB	0x0084	nForce2 400 SMBus
 product NVIDIA NFORCE2_400_IDE	0x0085	nForce2 400 IDE
 product NVIDIA NFORCE3_LAN2	0x0086	nForce3 LAN
-product NVIDIA NFORCE2_400_USB	0x0087	nForce2 400 USB
-product NVIDIA NFORCE2_400_USB2	0x0088	nForce2 400 USB2
+product NVIDIA NFORCE2_400_OHCI	0x0087	nForce2 400 USB
+product NVIDIA NFORCE2_400_EHCI	0x0088	nForce2 400 USB
 product NVIDIA NFORCE2_400_ACA	0x008a	nForce2 400 AC97
 product NVIDIA NFORCE2_400_PPB	0x008b	nForce2 400 PCI-PCI
 product NVIDIA NFORCE3_LAN3	0x008c	nForce3 LAN
@@ -3222,8 +3222,8 @@ product NVIDIA CK804_MEM	0x00d3	CK804
 product NVIDIA NFORCE3_SMB	0x00d4	nForce3 SMBus
 product NVIDIA NFORCE3_IDE	0x00d5	nForce3 IDE
 product NVIDIA NFORCE3_LAN1	0x00d6	nForce3 LAN
-product NVIDIA NFORCE3_USB	0x00d7	nForce3 USB
-product NVIDIA NFORCE3_USB2	0x00d8	nForce3 USB
+product NVIDIA NFORCE3_OHCI	0x00d7	nForce3 USB
+product NVIDIA NFORCE3_EHCI	0x00d8	nForce3 USB
 product NVIDIA NFORCE3_MODEM	0x00d9	nForce3 Modem
 product NVIDIA NFORCE3_ACA	0x00da	nForce3 AC97
 product NVIDIA NFORCE3_PPB	0x00dd	nForce3 PCI-PCI
@@ -3235,8 +3235,8 @@ product NVIDIA NFORCE3_250_SATA	0x00e3	nForce3 250 SATA
 product NVIDIA NFORCE3_250_SMB	0x00e4	nForce3 250 SMBus
 product NVIDIA NFORCE3_250_IDE	0x00e5	nForce3 250 IDE
 product NVIDIA NFORCE3_LAN5	0x00e6	nForce3 LAN
-product NVIDIA NFORCE3_250_USB	0x00e7	nForce3 250 USB
-product NVIDIA NFORCE3_250_USB2	0x00e8	nForce3 250 USB2
+product NVIDIA NFORCE3_250_OHCI	0x00e7	nForce3 250 USB
+product NVIDIA NFORCE3_250_EHCI	0x00e8	nForce3 250 USB
 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
@@ -3297,7 +3297,7 @@ product NVIDIA NFORCE_SMB	0x01b4	nForce SMBus
 product NVIDIA NFORCE_AGP	0x01b7	nForce AGP
 product NVIDIA NFORCE_PPB	0x01b8	nForce PCI-PCI
 product NVIDIA NFORCE_IDE	0x01bc	nForce IDE
-product NVIDIA NFORCE_USB	0x01c2	nForce USB
+product NVIDIA NFORCE_OHCI	0x01c2	nForce USB
 product NVIDIA NFORCE_LAN	0x01c3	nForce LAN
 product NVIDIA GEFORCE7300LE	0x01d1	GeForce 7300 LE
 product NVIDIA GEFORCE7200GS	0x01d3	GeForce 7200 GS
@@ -3402,13 +3402,11 @@ product NVIDIA MCP55_ISA6	0x0365	MCP55 ISA
 product NVIDIA MCP55_ISA7	0x0366	MCP55 ISA
 product NVIDIA MCP55_ISA8	0x0367	MCP55 ISA
 product NVIDIA MCP55_SMB	0x0368	MCP55 SMBus
-product NVIDIA MCP55_USB_1	0x036c	MCP55 USB
-product NVIDIA MCP55_USB_2	0x036d	MCP55 USB
-product NVIDIA MCP55_IDE	0x036e	MCP55 IDE
-product NVIDIA MCP55_MEM2	0x0369	MCP55 Memory
-product NVIDIA MCP55_MEM3	0x036a	MCP55 Memory
+product NVIDIA MCP55_MEM1	0x0369	MCP55 Memory
+product NVIDIA MCP55_MEM2	0x036a	MCP55 Memory
 product NVIDIA MCP55_OHCI	0x036c	MCP55 USB
 product NVIDIA MCP55_EHCI	0x036d	MCP55 USB
+product NVIDIA MCP55_IDE	0x036e	MCP55 IDE
 product NVIDIA MCP55_PPB_6	0x0370	MCP55 PCI-PCI
 product NVIDIA MCP55_HDA	0x0371	MCP55 HD Audio
 product NVIDIA MCP55_LAN1	0x0372	MCP55 LAN
@@ -3418,7 +3416,7 @@ product NVIDIA MCP55_PPB_2	0x0375	MCP55 PCIE
 product NVIDIA MCP55_PPB_3	0x0376	MCP55 PCIE
 product NVIDIA MCP55_PPB_4	0x0377	MCP55 PCIE
 product NVIDIA MCP55_PPB_5	0x0378	MCP55 PCIE
-product NVIDIA MCP55_MEM	0x037a	MCP55 Memory
+product NVIDIA MCP55_MEM3	0x037a	MCP55 Memory
 product NVIDIA MCP55_SATA	0x037e	MCP55 SATA
 product NVIDIA MCP55_SATA2	0x037f	MCP55 SATA
 product NVIDIA GEFORCE7600GT	0x0391	GeForce 7600 GT
@@ -3462,7 +3460,7 @@ product NVIDIA MCP61_LAN2	0x03e6	MCP61 LAN
 product NVIDIA MCP61_SATA	0x03e7	MCP61 SATA
 product NVIDIA MCP61_PPB_1	0x03e8	MCP61 PCIE
 product NVIDIA MCP61_PPB_2	0x03e9	MCP61 PCIE
-product NVIDIA MCP61_MEM	0x03ea	MCP61 Memory
+product NVIDIA MCP61_MEM1	0x03ea	MCP61 Memory
 product NVIDIA MCP61_SMB	0x03eb	MCP61 SMBus
 product NVIDIA MCP61_IDE	0x03ec	MCP61 IDE
 product NVIDIA MCP61_LAN3	0x03ee	MCP61 LAN
@@ -3480,13 +3478,13 @@ product NVIDIA GEFORCE8600M_GT	0x0407	GeForce 8600M GT
 product NVIDIA QUADROFX570M	0x040c	Quadro FX 570M
 product NVIDIA GEFORCE8400_GS	0x0422	GeForce 8400 GS
 product NVIDIA GEFORCE8400M_G	0x0428	GeForce 8400M G
-product NVIDIA MCP65_ISA	0x0440	MCP65 ISA
+product NVIDIA MCP65_ISA1	0x0440	MCP65 ISA
 product NVIDIA MCP65_ISA2	0x0441	MCP65 ISA
-product NVIDIA MCP65_MEM	0x0444	MCP65 Memory
+product NVIDIA MCP65_MEM1	0x0444	MCP65 Memory
 product NVIDIA MCP65_MEM2	0x0445	MCP65 Memory
 product NVIDIA MCP65_SMB	0x0446	MCP65 SMBus
 product NVIDIA MCP65_IDE	0x0448	MCP65 IDE
-product NVIDIA MCP65_PCI	0x0449	MCP65 PCI
+product NVIDIA MCP65_PPB_1	0x0449	MCP65 PCI
 product NVIDIA MCP65_HDA_1	0x044a	MCP65 HD Audio
 product NVIDIA MCP65_HDA_2	0x044b	MCP65 HD Audio
 product NVIDIA MCP65_AHCI_1	0x044c	MCP65 AHCI
@@ -3501,18 +3499,20 @@ product NVIDIA MCP65_USB_1	0x0454	MCP65 USB
 product NVIDIA MCP65_USB_2	0x0455	MCP65 USB
 product NVIDIA MCP65_USB_3	0x0456	MCP65 USB
 product NVIDIA MCP65_USB_4	0x0457	MCP65 USB
-product NVIDIA MCP65_PPB_1	0x0458	MCP65 PCIE
-product NVIDIA MCP65_PPB_2	0x0459	MCP65 PCIE
-product NVIDIA MCP65_PPB_3	0x045a	MCP65 PCIE
+product NVIDIA MCP65_PPB_2	0x0458	MCP65 PCIE
+product NVIDIA MCP65_PPB_3	0x0459	MCP65 PCIE
+product NVIDIA MCP65_PPB_4	0x045a	MCP65 PCIE
+product NVIDIA MCP65_PPB_5	0x045b	MCP65 PCIE
 product NVIDIA MCP65_SATA	0x045c	MCP65 SATA
 product NVIDIA MCP65_SATA2	0x045d	MCP65 SATA
 product NVIDIA MCP65_SATA3	0x045e	MCP65 SATA
 product NVIDIA MCP65_SATA4	0x045f	MCP65 SATA
 product NVIDIA GEFORCE7000M	0x0533	GeForce 7000M
-product NVIDIA MCP67_MEM2	0x0541	MCP67 Memory
+product NVIDIA MCP67_MEM1	0x0541	MCP67 Memory
 product NVIDIA MCP67_SMB	0x0542	MCP67 SMBus
-product NVIDIA MCP67_MEM_1	0x0547	MCP67 Memory
-product NVIDIA MCP67_HB_1	0x0548	MCP67 Host
+product NVIDIA MCP67_COPROC	0x0543	MCP67 Co-processor
+product NVIDIA MCP67_MEM2	0x0547	MCP67 Memory
+product NVIDIA MCP67_ISA	0x0548	MCP67 ISA
 product NVIDIA MCP67_LAN1	0x054c	MCP67 LAN
 product NVIDIA MCP67_LAN2	0x054d	MCP67 LAN
 product NVIDIA MCP67_LAN3	0x054e	MCP67 LAN
@@ -3535,7 +3535,8 @@ product NVIDIA MCP67_OHCI	0x055e	MCP67 USB
 product NVIDIA MCP67_EHCI	0x055f	MCP67 USB
 product NVIDIA MCP67_IDE	0x0560	MCP67 IDE
 product NVIDIA MCP67_PPB_1	0x0561	MCP67 PCI
-product NVIDIA MCP67_PPB_2	0x0563	MCP67 PCIE
+product NVIDIA MCP67_PPB_2	0x0562	MCP67 PCIE
+product NVIDIA MCP67_PPB_3	0x0563	MCP67 PCIE
 product NVIDIA MCP73_EHCI	0x056a	MCP73 USB
 product NVIDIA MCP73_IDE	0x056c	MCP73 IDE
 product NVIDIA MCP73_PPB_1	0x056d	MCP73 PCIE
@@ -3553,7 +3554,7 @@ product NVIDIA MCP77_HDA_3	0x0776	MCP77 HD Audio
 product NVIDIA MCP77_HDA_4	0x0777	MCP77 HD Audio
 product NVIDIA MCP73_HB_1	0x07c3	MCP73 Host
 product NVIDIA MCP73_MEM11	0x07c8	MCP73 Memory
-product NVIDIA MCP73_MEM	0x07cb	MCP73 Memory
+product NVIDIA MCP73_MEM1	0x07cb	MCP73 Memory
 product NVIDIA MCP73_MEM2	0x07cd	MCP73 Memory
 product NVIDIA MCP73_MEM3	0x07ce	MCP73 Memory
 product NVIDIA MCP73_MEM4	0x07cf	MCP73 Memory