summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2008-09-17 05:22:07 +0000
committerBrad Smith <brad@cvs.openbsd.org>2008-09-17 05:22:07 +0000
commit49ee663949ff694b35bb9ab6cf085cd472b10751 (patch)
tree0c2d4eedb41065b84ac21b452ff33ef252a5f37c /sys/dev/pci
parenta4c1dff56c0da522014834b62ea3d081a956447f (diff)
regen
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/pcidevs.h63
-rw-r--r--sys/dev/pci/pcidevs_data.h88
2 files changed, 78 insertions, 73 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 73559330a18..1037621ff66 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * 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 $ */
@@ -3179,7 +3179,7 @@
#define PCI_PRODUCT_NVIDIA_MCP04_ECHI 0x003c /* MCP04 USB */
#define PCI_PRODUCT_NVIDIA_MCP04_PPB 0x003d /* MCP04 PCI-PCI */
#define PCI_PRODUCT_NVIDIA_MCP04_SATA2 0x003e /* MCP04 SATA */
-#define PCI_PRODUCT_NVIDIA_NFORCE4_ISA 0x0050 /* nForce4 ISA */
+#define PCI_PRODUCT_NVIDIA_NFORCE4_ISA1 0x0050 /* nForce4 ISA */
#define PCI_PRODUCT_NVIDIA_NFORCE4_ISA2 0x0051 /* nForce4 ISA */
#define PCI_PRODUCT_NVIDIA_NFORCE4_SMB 0x0052 /* nForce4 SMBus */
#define PCI_PRODUCT_NVIDIA_NFORCE4_ATA133 0x0053 /* nForce4 IDE */
@@ -3188,8 +3188,8 @@
#define PCI_PRODUCT_NVIDIA_CK804_LAN1 0x0056 /* CK804 LAN */
#define PCI_PRODUCT_NVIDIA_CK804_LAN2 0x0057 /* CK804 LAN */
#define PCI_PRODUCT_NVIDIA_NFORCE4_AC 0x0059 /* nForce4 AC97 */
-#define PCI_PRODUCT_NVIDIA_NFORCE4_USB 0x005a /* nForce4 USB */
-#define PCI_PRODUCT_NVIDIA_NFORCE4_USB2 0x005b /* nForce4 USB */
+#define PCI_PRODUCT_NVIDIA_NFORCE4_OHCI 0x005a /* nForce4 USB */
+#define PCI_PRODUCT_NVIDIA_NFORCE4_EHCI 0x005b /* nForce4 USB */
#define PCI_PRODUCT_NVIDIA_NFORCE4_PPB 0x005c /* nForce4 PCI-PCI */
#define PCI_PRODUCT_NVIDIA_NFORCE4_PPB2 0x005d /* nForce4 PCIE */
#define PCI_PRODUCT_NVIDIA_NFORCE4_MEM 0x005e /* nForce4 DDR */
@@ -3197,8 +3197,8 @@
#define PCI_PRODUCT_NVIDIA_NFORCE2_SMB 0x0064 /* nForce2 SMBus */
#define PCI_PRODUCT_NVIDIA_NFORCE2_IDE 0x0065 /* nForce2 IDE */
#define PCI_PRODUCT_NVIDIA_NFORCE2_LAN 0x0066 /* nForce2 LAN */
-#define PCI_PRODUCT_NVIDIA_NFORCE2_USB 0x0067 /* nForce2 USB */
-#define PCI_PRODUCT_NVIDIA_NFORCE2_USB2 0x0068 /* nForce2 USB */
+#define PCI_PRODUCT_NVIDIA_NFORCE2_OHCI 0x0067 /* nForce2 USB */
+#define PCI_PRODUCT_NVIDIA_NFORCE2_EHCI 0x0068 /* nForce2 USB */
#define PCI_PRODUCT_NVIDIA_NFORCE2_ACA 0x006a /* nForce2 AC97 */
#define PCI_PRODUCT_NVIDIA_NFORCE2_APU 0x006b /* nForce2 Audio */
#define PCI_PRODUCT_NVIDIA_NFORCE2_PPB 0x006c /* nForce2 PCI-PCI */
@@ -3209,8 +3209,8 @@
#define PCI_PRODUCT_NVIDIA_NFORCE2_400_SMB 0x0084 /* nForce2 400 SMBus */
#define PCI_PRODUCT_NVIDIA_NFORCE2_400_IDE 0x0085 /* nForce2 400 IDE */
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN2 0x0086 /* nForce3 LAN */
-#define PCI_PRODUCT_NVIDIA_NFORCE2_400_USB 0x0087 /* nForce2 400 USB */
-#define PCI_PRODUCT_NVIDIA_NFORCE2_400_USB2 0x0088 /* nForce2 400 USB2 */
+#define PCI_PRODUCT_NVIDIA_NFORCE2_400_OHCI 0x0087 /* nForce2 400 USB */
+#define PCI_PRODUCT_NVIDIA_NFORCE2_400_EHCI 0x0088 /* nForce2 400 USB */
#define PCI_PRODUCT_NVIDIA_NFORCE2_400_ACA 0x008a /* nForce2 400 AC97 */
#define PCI_PRODUCT_NVIDIA_NFORCE2_400_PPB 0x008b /* nForce2 400 PCI-PCI */
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN3 0x008c /* nForce3 LAN */
@@ -3227,8 +3227,8 @@
#define PCI_PRODUCT_NVIDIA_NFORCE3_SMB 0x00d4 /* nForce3 SMBus */
#define PCI_PRODUCT_NVIDIA_NFORCE3_IDE 0x00d5 /* nForce3 IDE */
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN1 0x00d6 /* nForce3 LAN */
-#define PCI_PRODUCT_NVIDIA_NFORCE3_USB 0x00d7 /* nForce3 USB */
-#define PCI_PRODUCT_NVIDIA_NFORCE3_USB2 0x00d8 /* nForce3 USB */
+#define PCI_PRODUCT_NVIDIA_NFORCE3_OHCI 0x00d7 /* nForce3 USB */
+#define PCI_PRODUCT_NVIDIA_NFORCE3_EHCI 0x00d8 /* nForce3 USB */
#define PCI_PRODUCT_NVIDIA_NFORCE3_MODEM 0x00d9 /* nForce3 Modem */
#define PCI_PRODUCT_NVIDIA_NFORCE3_ACA 0x00da /* nForce3 AC97 */
#define PCI_PRODUCT_NVIDIA_NFORCE3_PPB 0x00dd /* nForce3 PCI-PCI */
@@ -3240,8 +3240,8 @@
#define PCI_PRODUCT_NVIDIA_NFORCE3_250_SMB 0x00e4 /* nForce3 250 SMBus */
#define PCI_PRODUCT_NVIDIA_NFORCE3_250_IDE 0x00e5 /* nForce3 250 IDE */
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN5 0x00e6 /* nForce3 LAN */
-#define PCI_PRODUCT_NVIDIA_NFORCE3_250_USB 0x00e7 /* nForce3 250 USB */
-#define PCI_PRODUCT_NVIDIA_NFORCE3_250_USB2 0x00e8 /* nForce3 250 USB2 */
+#define PCI_PRODUCT_NVIDIA_NFORCE3_250_OHCI 0x00e7 /* nForce3 250 USB */
+#define PCI_PRODUCT_NVIDIA_NFORCE3_250_EHCI 0x00e8 /* nForce3 250 USB */
#define PCI_PRODUCT_NVIDIA_NFORCE3_250_ACA 0x00ea /* nForce3 250 AC97 */
#define PCI_PRODUCT_NVIDIA_NFORCE3_250_PPB 0x00ed /* nForce3 250 PCI-PCI */
#define PCI_PRODUCT_NVIDIA_NFORCE3_250_SATA2 0x00ee /* nForce3 250 SATA */
@@ -3302,7 +3302,7 @@
#define PCI_PRODUCT_NVIDIA_NFORCE_AGP 0x01b7 /* nForce AGP */
#define PCI_PRODUCT_NVIDIA_NFORCE_PPB 0x01b8 /* nForce PCI-PCI */
#define PCI_PRODUCT_NVIDIA_NFORCE_IDE 0x01bc /* nForce IDE */
-#define PCI_PRODUCT_NVIDIA_NFORCE_USB 0x01c2 /* nForce USB */
+#define PCI_PRODUCT_NVIDIA_NFORCE_OHCI 0x01c2 /* nForce USB */
#define PCI_PRODUCT_NVIDIA_NFORCE_LAN 0x01c3 /* nForce LAN */
#define PCI_PRODUCT_NVIDIA_GEFORCE7300LE 0x01d1 /* GeForce 7300 LE */
#define PCI_PRODUCT_NVIDIA_GEFORCE7200GS 0x01d3 /* GeForce 7200 GS */
@@ -3407,13 +3407,11 @@
#define PCI_PRODUCT_NVIDIA_MCP55_ISA7 0x0366 /* MCP55 ISA */
#define PCI_PRODUCT_NVIDIA_MCP55_ISA8 0x0367 /* MCP55 ISA */
#define PCI_PRODUCT_NVIDIA_MCP55_SMB 0x0368 /* MCP55 SMBus */
-#define PCI_PRODUCT_NVIDIA_MCP55_USB_1 0x036c /* MCP55 USB */
-#define PCI_PRODUCT_NVIDIA_MCP55_USB_2 0x036d /* MCP55 USB */
-#define PCI_PRODUCT_NVIDIA_MCP55_IDE 0x036e /* MCP55 IDE */
-#define PCI_PRODUCT_NVIDIA_MCP55_MEM2 0x0369 /* MCP55 Memory */
-#define PCI_PRODUCT_NVIDIA_MCP55_MEM3 0x036a /* MCP55 Memory */
+#define PCI_PRODUCT_NVIDIA_MCP55_MEM1 0x0369 /* MCP55 Memory */
+#define PCI_PRODUCT_NVIDIA_MCP55_MEM2 0x036a /* MCP55 Memory */
#define PCI_PRODUCT_NVIDIA_MCP55_OHCI 0x036c /* MCP55 USB */
#define PCI_PRODUCT_NVIDIA_MCP55_EHCI 0x036d /* MCP55 USB */
+#define PCI_PRODUCT_NVIDIA_MCP55_IDE 0x036e /* MCP55 IDE */
#define PCI_PRODUCT_NVIDIA_MCP55_PPB_6 0x0370 /* MCP55 PCI-PCI */
#define PCI_PRODUCT_NVIDIA_MCP55_HDA 0x0371 /* MCP55 HD Audio */
#define PCI_PRODUCT_NVIDIA_MCP55_LAN1 0x0372 /* MCP55 LAN */
@@ -3423,7 +3421,7 @@
#define PCI_PRODUCT_NVIDIA_MCP55_PPB_3 0x0376 /* MCP55 PCIE */
#define PCI_PRODUCT_NVIDIA_MCP55_PPB_4 0x0377 /* MCP55 PCIE */
#define PCI_PRODUCT_NVIDIA_MCP55_PPB_5 0x0378 /* MCP55 PCIE */
-#define PCI_PRODUCT_NVIDIA_MCP55_MEM 0x037a /* MCP55 Memory */
+#define PCI_PRODUCT_NVIDIA_MCP55_MEM3 0x037a /* MCP55 Memory */
#define PCI_PRODUCT_NVIDIA_MCP55_SATA 0x037e /* MCP55 SATA */
#define PCI_PRODUCT_NVIDIA_MCP55_SATA2 0x037f /* MCP55 SATA */
#define PCI_PRODUCT_NVIDIA_GEFORCE7600GT 0x0391 /* GeForce 7600 GT */
@@ -3467,7 +3465,7 @@
#define PCI_PRODUCT_NVIDIA_MCP61_SATA 0x03e7 /* MCP61 SATA */
#define PCI_PRODUCT_NVIDIA_MCP61_PPB_1 0x03e8 /* MCP61 PCIE */
#define PCI_PRODUCT_NVIDIA_MCP61_PPB_2 0x03e9 /* MCP61 PCIE */
-#define PCI_PRODUCT_NVIDIA_MCP61_MEM 0x03ea /* MCP61 Memory */
+#define PCI_PRODUCT_NVIDIA_MCP61_MEM1 0x03ea /* MCP61 Memory */
#define PCI_PRODUCT_NVIDIA_MCP61_SMB 0x03eb /* MCP61 SMBus */
#define PCI_PRODUCT_NVIDIA_MCP61_IDE 0x03ec /* MCP61 IDE */
#define PCI_PRODUCT_NVIDIA_MCP61_LAN3 0x03ee /* MCP61 LAN */
@@ -3485,13 +3483,13 @@
#define PCI_PRODUCT_NVIDIA_QUADROFX570M 0x040c /* Quadro FX 570M */
#define PCI_PRODUCT_NVIDIA_GEFORCE8400_GS 0x0422 /* GeForce 8400 GS */
#define PCI_PRODUCT_NVIDIA_GEFORCE8400M_G 0x0428 /* GeForce 8400M G */
-#define PCI_PRODUCT_NVIDIA_MCP65_ISA 0x0440 /* MCP65 ISA */
+#define PCI_PRODUCT_NVIDIA_MCP65_ISA1 0x0440 /* MCP65 ISA */
#define PCI_PRODUCT_NVIDIA_MCP65_ISA2 0x0441 /* MCP65 ISA */
-#define PCI_PRODUCT_NVIDIA_MCP65_MEM 0x0444 /* MCP65 Memory */
+#define PCI_PRODUCT_NVIDIA_MCP65_MEM1 0x0444 /* MCP65 Memory */
#define PCI_PRODUCT_NVIDIA_MCP65_MEM2 0x0445 /* MCP65 Memory */
#define PCI_PRODUCT_NVIDIA_MCP65_SMB 0x0446 /* MCP65 SMBus */
#define PCI_PRODUCT_NVIDIA_MCP65_IDE 0x0448 /* MCP65 IDE */
-#define PCI_PRODUCT_NVIDIA_MCP65_PCI 0x0449 /* MCP65 PCI */
+#define PCI_PRODUCT_NVIDIA_MCP65_PPB_1 0x0449 /* MCP65 PCI */
#define PCI_PRODUCT_NVIDIA_MCP65_HDA_1 0x044a /* MCP65 HD Audio */
#define PCI_PRODUCT_NVIDIA_MCP65_HDA_2 0x044b /* MCP65 HD Audio */
#define PCI_PRODUCT_NVIDIA_MCP65_AHCI_1 0x044c /* MCP65 AHCI */
@@ -3506,18 +3504,20 @@
#define PCI_PRODUCT_NVIDIA_MCP65_USB_2 0x0455 /* MCP65 USB */
#define PCI_PRODUCT_NVIDIA_MCP65_USB_3 0x0456 /* MCP65 USB */
#define PCI_PRODUCT_NVIDIA_MCP65_USB_4 0x0457 /* MCP65 USB */
-#define PCI_PRODUCT_NVIDIA_MCP65_PPB_1 0x0458 /* MCP65 PCIE */
-#define PCI_PRODUCT_NVIDIA_MCP65_PPB_2 0x0459 /* MCP65 PCIE */
-#define PCI_PRODUCT_NVIDIA_MCP65_PPB_3 0x045a /* MCP65 PCIE */
+#define PCI_PRODUCT_NVIDIA_MCP65_PPB_2 0x0458 /* MCP65 PCIE */
+#define PCI_PRODUCT_NVIDIA_MCP65_PPB_3 0x0459 /* MCP65 PCIE */
+#define PCI_PRODUCT_NVIDIA_MCP65_PPB_4 0x045a /* MCP65 PCIE */
+#define PCI_PRODUCT_NVIDIA_MCP65_PPB_5 0x045b /* MCP65 PCIE */
#define PCI_PRODUCT_NVIDIA_MCP65_SATA 0x045c /* MCP65 SATA */
#define PCI_PRODUCT_NVIDIA_MCP65_SATA2 0x045d /* MCP65 SATA */
#define PCI_PRODUCT_NVIDIA_MCP65_SATA3 0x045e /* MCP65 SATA */
#define PCI_PRODUCT_NVIDIA_MCP65_SATA4 0x045f /* MCP65 SATA */
#define PCI_PRODUCT_NVIDIA_GEFORCE7000M 0x0533 /* GeForce 7000M */
-#define PCI_PRODUCT_NVIDIA_MCP67_MEM2 0x0541 /* MCP67 Memory */
+#define PCI_PRODUCT_NVIDIA_MCP67_MEM1 0x0541 /* MCP67 Memory */
#define PCI_PRODUCT_NVIDIA_MCP67_SMB 0x0542 /* MCP67 SMBus */
-#define PCI_PRODUCT_NVIDIA_MCP67_MEM_1 0x0547 /* MCP67 Memory */
-#define PCI_PRODUCT_NVIDIA_MCP67_HB_1 0x0548 /* MCP67 Host */
+#define PCI_PRODUCT_NVIDIA_MCP67_COPROC 0x0543 /* MCP67 Co-processor */
+#define PCI_PRODUCT_NVIDIA_MCP67_MEM2 0x0547 /* MCP67 Memory */
+#define PCI_PRODUCT_NVIDIA_MCP67_ISA 0x0548 /* MCP67 ISA */
#define PCI_PRODUCT_NVIDIA_MCP67_LAN1 0x054c /* MCP67 LAN */
#define PCI_PRODUCT_NVIDIA_MCP67_LAN2 0x054d /* MCP67 LAN */
#define PCI_PRODUCT_NVIDIA_MCP67_LAN3 0x054e /* MCP67 LAN */
@@ -3540,7 +3540,8 @@
#define PCI_PRODUCT_NVIDIA_MCP67_EHCI 0x055f /* MCP67 USB */
#define PCI_PRODUCT_NVIDIA_MCP67_IDE 0x0560 /* MCP67 IDE */
#define PCI_PRODUCT_NVIDIA_MCP67_PPB_1 0x0561 /* MCP67 PCI */
-#define PCI_PRODUCT_NVIDIA_MCP67_PPB_2 0x0563 /* MCP67 PCIE */
+#define PCI_PRODUCT_NVIDIA_MCP67_PPB_2 0x0562 /* MCP67 PCIE */
+#define PCI_PRODUCT_NVIDIA_MCP67_PPB_3 0x0563 /* MCP67 PCIE */
#define PCI_PRODUCT_NVIDIA_MCP73_EHCI 0x056a /* MCP73 USB */
#define PCI_PRODUCT_NVIDIA_MCP73_IDE 0x056c /* MCP73 IDE */
#define PCI_PRODUCT_NVIDIA_MCP73_PPB_1 0x056d /* MCP73 PCIE */
@@ -3558,7 +3559,7 @@
#define PCI_PRODUCT_NVIDIA_MCP77_HDA_4 0x0777 /* MCP77 HD Audio */
#define PCI_PRODUCT_NVIDIA_MCP73_HB_1 0x07c3 /* MCP73 Host */
#define PCI_PRODUCT_NVIDIA_MCP73_MEM11 0x07c8 /* MCP73 Memory */
-#define PCI_PRODUCT_NVIDIA_MCP73_MEM 0x07cb /* MCP73 Memory */
+#define PCI_PRODUCT_NVIDIA_MCP73_MEM1 0x07cb /* MCP73 Memory */
#define PCI_PRODUCT_NVIDIA_MCP73_MEM2 0x07cd /* MCP73 Memory */
#define PCI_PRODUCT_NVIDIA_MCP73_MEM3 0x07ce /* MCP73 Memory */
#define PCI_PRODUCT_NVIDIA_MCP73_MEM4 0x07cf /* MCP73 Memory */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 2a00b1e953a..7dd97b3dcb5 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * 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 $ */
@@ -9936,7 +9936,7 @@ static const struct pci_known_product pci_known_products[] = {
"MCP04 SATA",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_ISA,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_ISA1,
"nForce4 ISA",
},
{
@@ -9972,11 +9972,11 @@ static const struct pci_known_product pci_known_products[] = {
"nForce4 AC97",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_USB,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_OHCI,
"nForce4 USB",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_USB2,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_EHCI,
"nForce4 USB",
},
{
@@ -10008,11 +10008,11 @@ static const struct pci_known_product pci_known_products[] = {
"nForce2 LAN",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_USB,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_OHCI,
"nForce2 USB",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_USB2,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_EHCI,
"nForce2 USB",
},
{
@@ -10056,12 +10056,12 @@ static const struct pci_known_product pci_known_products[] = {
"nForce3 LAN",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_USB,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_OHCI,
"nForce2 400 USB",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_USB2,
- "nForce2 400 USB2",
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_EHCI,
+ "nForce2 400 USB",
},
{
PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_ACA,
@@ -10128,11 +10128,11 @@ static const struct pci_known_product pci_known_products[] = {
"nForce3 LAN",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_USB,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_OHCI,
"nForce3 USB",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_USB2,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_EHCI,
"nForce3 USB",
},
{
@@ -10180,12 +10180,12 @@ static const struct pci_known_product pci_known_products[] = {
"nForce3 LAN",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_USB,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_OHCI,
"nForce3 250 USB",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_USB2,
- "nForce3 250 USB2",
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_EHCI,
+ "nForce3 250 USB",
},
{
PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_ACA,
@@ -10428,7 +10428,7 @@ static const struct pci_known_product pci_known_products[] = {
"nForce IDE",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_USB,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_OHCI,
"nForce USB",
},
{
@@ -10848,23 +10848,11 @@ static const struct pci_known_product pci_known_products[] = {
"MCP55 SMBus",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_USB_1,
- "MCP55 USB",
- },
- {
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_USB_2,
- "MCP55 USB",
- },
- {
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_IDE,
- "MCP55 IDE",
- },
- {
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_MEM2,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_MEM1,
"MCP55 Memory",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_MEM3,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_MEM2,
"MCP55 Memory",
},
{
@@ -10876,6 +10864,10 @@ static const struct pci_known_product pci_known_products[] = {
"MCP55 USB",
},
{
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_IDE,
+ "MCP55 IDE",
+ },
+ {
PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_PPB_6,
"MCP55 PCI-PCI",
},
@@ -10912,7 +10904,7 @@ static const struct pci_known_product pci_known_products[] = {
"MCP55 PCIE",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_MEM,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP55_MEM3,
"MCP55 Memory",
},
{
@@ -11088,7 +11080,7 @@ static const struct pci_known_product pci_known_products[] = {
"MCP61 PCIE",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_MEM,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP61_MEM1,
"MCP61 Memory",
},
{
@@ -11160,7 +11152,7 @@ static const struct pci_known_product pci_known_products[] = {
"GeForce 8400M G",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_ISA,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_ISA1,
"MCP65 ISA",
},
{
@@ -11168,7 +11160,7 @@ static const struct pci_known_product pci_known_products[] = {
"MCP65 ISA",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_MEM,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_MEM1,
"MCP65 Memory",
},
{
@@ -11184,7 +11176,7 @@ static const struct pci_known_product pci_known_products[] = {
"MCP65 IDE",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_PCI,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_PPB_1,
"MCP65 PCI",
},
{
@@ -11244,15 +11236,19 @@ static const struct pci_known_product pci_known_products[] = {
"MCP65 USB",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_PPB_1,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_PPB_2,
"MCP65 PCIE",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_PPB_2,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_PPB_3,
"MCP65 PCIE",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_PPB_3,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_PPB_4,
+ "MCP65 PCIE",
+ },
+ {
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_PPB_5,
"MCP65 PCIE",
},
{
@@ -11276,7 +11272,7 @@ static const struct pci_known_product pci_known_products[] = {
"GeForce 7000M",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_MEM2,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_MEM1,
"MCP67 Memory",
},
{
@@ -11284,12 +11280,16 @@ static const struct pci_known_product pci_known_products[] = {
"MCP67 SMBus",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_MEM_1,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_COPROC,
+ "MCP67 Co-processor",
+ },
+ {
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_MEM2,
"MCP67 Memory",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_HB_1,
- "MCP67 Host",
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_ISA,
+ "MCP67 ISA",
},
{
PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_LAN1,
@@ -11384,6 +11384,10 @@ static const struct pci_known_product pci_known_products[] = {
"MCP67 PCIE",
},
{
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_PPB_3,
+ "MCP67 PCIE",
+ },
+ {
PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_EHCI,
"MCP73 USB",
},
@@ -11452,7 +11456,7 @@ static const struct pci_known_product pci_known_products[] = {
"MCP73 Memory",
},
{
- PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_MEM,
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_MEM1,
"MCP73 Memory",
},
{