sync

2 files changed, 83 insertions, 38 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 3a5780b8e78..03293e7346c 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.1506 2009/11/08 11:54:48 damien Exp 
+ *	OpenBSD: pcidevs,v 1.1507 2009/11/09 14:04:32 sthen Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -2802,6 +2802,7 @@
 #define	PCI_PRODUCT_INTEL_82G45_PCIE	0x2e21		/* G45 PCIE */
 #define	PCI_PRODUCT_INTEL_82G45_IGD_1	0x2e22		/* G45 Video */
 #define	PCI_PRODUCT_INTEL_82G45_IGD_2	0x2e23		/* G45 Video */
+#define	PCI_PRODUCT_INTEL_82G45_PCIE_1	0x2e29		/* G45 PCIE */
 #define	PCI_PRODUCT_INTEL_82G41_HB	0x2e30		/* G41 Host */
 #define	PCI_PRODUCT_INTEL_82G41_IGD_1	0x2e32		/* G41 Video */
 #define	PCI_PRODUCT_INTEL_82G41_IGD_2	0x2e33		/* G41 Video */
@@ -2824,6 +2825,8 @@
 #define	PCI_PRODUCT_INTEL_82X58_PCIE_8	0x340f		/* X58 PCIE */
 #define	PCI_PRODUCT_INTEL_82X58_PCIE_9	0x3410		/* X58 PCIE */
 #define	PCI_PRODUCT_INTEL_82X58_PCIE_10	0x3411		/* X58 PCIE */
+#define	PCI_PRODUCT_INTEL_82X58_QP0_PHY	0x3418		/* 5520/X58 QuickPath */
+#define	PCI_PRODUCT_INTEL_5520_QP1_PHY	0x3419		/* 5520 QuickPath */
 #define	PCI_PRODUCT_INTEL_82X58_GPIO	0x3422		/* X58 GPIO */
 #define	PCI_PRODUCT_INTEL_82X58_RAS	0x3423		/* X58 RAS */
 #define	PCI_PRODUCT_INTEL_82X58_QP0_P0	0x3425		/* X58 QuickPath */
@@ -2941,6 +2944,7 @@
 #define	PCI_PRODUCT_INTEL_82801JD_PCIE_5	0x3a78		/* 82801JD PCIE */
 #define	PCI_PRODUCT_INTEL_82801JD_PCIE_6	0x3a7a		/* 82801JD PCIE */
 #define	PCI_PRODUCT_INTEL_82801JD_LAN	0x3a7c		/* 82801JD LAN */
+#define	PCI_PRODUCT_INTEL_P55_LPC	0x3b02		/* P55 LPC */
 #define	PCI_PRODUCT_INTEL_3400_LPC	0x3b14		/* 3400 LPC */
 #define	PCI_PRODUCT_INTEL_3400_SATA_1	0x3b20		/* 3400 SATA */
 #define	PCI_PRODUCT_INTEL_3400_SATA_2	0x3b21		/* 3400 SATA */
@@ -2956,8 +2960,16 @@
 #define	PCI_PRODUCT_INTEL_3400_AHCI_4	0x3b2f		/* 3400 AHCI */
 #define	PCI_PRODUCT_INTEL_3400_SMB	0x3b30		/* 3400 SMBus */
 #define	PCI_PRODUCT_INTEL_3400_THERMAL	0x3b32		/* 3400 Thermal */
-#define	PCI_PRODUCT_INTEL_3400_EHCI_1	0x3b34		/* 3400 EHCI */
-#define	PCI_PRODUCT_INTEL_3400_EHCI_2	0x3b3c		/* 3400 EHCI */
+#define	PCI_PRODUCT_INTEL_3400_EHCI_1	0x3b34		/* 3400 USB */
+#define	PCI_PRODUCT_INTEL_3400_UHCI_1	0x3b36		/* 3400 USB */
+#define	PCI_PRODUCT_INTEL_3400_UHCI_2	0x3b37		/* 3400 USB */
+#define	PCI_PRODUCT_INTEL_3400_UHCI_3	0x3b38		/* 3400 USB */
+#define	PCI_PRODUCT_INTEL_3400_UHCI_4	0x3b39		/* 3400 USB */
+#define	PCI_PRODUCT_INTEL_3400_UHCI_5	0x3b3a		/* 3400 USB */
+#define	PCI_PRODUCT_INTEL_3400_UHCI_6	0x3b3b		/* 3400 USB */
+#define	PCI_PRODUCT_INTEL_3400_EHCI_2	0x3b3c		/* 3400 USB */
+#define	PCI_PRODUCT_INTEL_3400_UHCI_7	0x3b3e		/* 3400 USB */
+#define	PCI_PRODUCT_INTEL_3400_UHCI_8	0x3b3f		/* 3400 USB */
 #define	PCI_PRODUCT_INTEL_3400_PCIE_1	0x3b42		/* 3400 PCIE */
 #define	PCI_PRODUCT_INTEL_3400_PCIE_2	0x3b44		/* 3400 PCIE */
 #define	PCI_PRODUCT_INTEL_3400_PCIE_3	0x3b46		/* 3400 PCIE */
@@ -3107,20 +3119,17 @@
 #define	PCI_PRODUCT_INTEL_RCU31L	0x96a1		/* RCU31L I2O RAID */
 #define	PCI_PRODUCT_INTEL_21152	0xb152		/* S21152BB PCI-PCI */
 #define	PCI_PRODUCT_INTEL_21154	0xb154		/* 21154AE/BE PCI-PCI */
-#define	PCI_PRODUCT_INTEL_CORE_DMI_0	0xd150		/* Core DMI */
-#define	PCI_PRODUCT_INTEL_CORE_DMI_1	0xd151		/* Core DMI */
-#define	PCI_PRODUCT_INTEL_CORE_DMI_2	0xd152		/* Core DMI */
-#define	PCI_PRODUCT_INTEL_CORE_DMI_3	0xd153		/* Core DMI */
-#define	PCI_PRODUCT_INTEL_CORE_DMI_4	0xd154		/* Core DMI */
-#define	PCI_PRODUCT_INTEL_CORE_DMI_5	0xd155		/* Core DMI */
-#define	PCI_PRODUCT_INTEL_CORE_DMI_6	0xd156		/* Core DMI */
-#define	PCI_PRODUCT_INTEL_CORE_DMI_7	0xd157		/* Core DMI */
+#define	PCI_PRODUCT_INTEL_CORE_DMI_0	0xd130		/* Core DMI */
+#define	PCI_PRODUCT_INTEL_CORE_DMI_1	0xd131		/* Core DMI */
 #define	PCI_PRODUCT_INTEL_CORE_PCIE_1	0xd138		/* Core PCIE */
 #define	PCI_PRODUCT_INTEL_CORE_PCIE_2	0xd139		/* Core PCIE */
 #define	PCI_PRODUCT_INTEL_CORE_PCIE_3	0xd13a		/* Core PCIE */
 #define	PCI_PRODUCT_INTEL_CORE_PCIE_4	0xd13b		/* Core PCIE */
 #define	PCI_PRODUCT_INTEL_CORE_QPI_L	0xd150		/* Core QPI Link */
 #define	PCI_PRODUCT_INTEL_CORE_QPI_R	0xd151		/* Core QPI Routing */
+#define	PCI_PRODUCT_INTEL_CORE_DMI_2	0xd152		/* Core DMI */
+#define	PCI_PRODUCT_INTEL_CORE_DMI_3	0xd153		/* Core DMI */
+#define	PCI_PRODUCT_INTEL_CORE_DMI_4	0xd154		/* Core DMI */
 #define	PCI_PRODUCT_INTEL_CORE_MANAGEMENT	0xd155		/* Core Management */
 #define	PCI_PRODUCT_INTEL_CORE_SCRATCH	0xd156		/* Core Scratch */
 #define	PCI_PRODUCT_INTEL_CORE_CONTROL	0xd157		/* Core Control */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 637ea5d9734..439035e768d 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.1506 2009/11/08 11:54:48 damien Exp 
+ *	OpenBSD: pcidevs,v 1.1507 2009/11/09 14:04:32 sthen Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -8900,6 +8900,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "G45 Video",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G45_PCIE_1,
+	    "G45 PCIE",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G41_HB,
 	    "G41 Host",
 	},
@@ -8988,6 +8992,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    "X58 PCIE",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82X58_QP0_PHY,
+	    "5520/X58 QuickPath",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_5520_QP1_PHY,
+	    "5520 QuickPath",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82X58_GPIO,
 	    "X58 GPIO",
 	},
@@ -9456,6 +9468,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "82801JD LAN",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_P55_LPC,
+	    "P55 LPC",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_LPC,
 	    "3400 LPC",
 	},
@@ -9517,11 +9533,43 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_EHCI_1,
-	    "3400 EHCI",
+	    "3400 USB",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_UHCI_1,
+	    "3400 USB",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_UHCI_2,
+	    "3400 USB",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_UHCI_3,
+	    "3400 USB",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_UHCI_4,
+	    "3400 USB",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_UHCI_5,
+	    "3400 USB",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_UHCI_6,
+	    "3400 USB",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_EHCI_2,
-	    "3400 EHCI",
+	    "3400 USB",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_UHCI_7,
+	    "3400 USB",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_UHCI_8,
+	    "3400 USB",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_PCIE_1,
@@ -10128,30 +10176,6 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Core DMI",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_DMI_2,
-	    "Core DMI",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_DMI_3,
-	    "Core DMI",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_DMI_4,
-	    "Core DMI",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_DMI_5,
-	    "Core DMI",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_DMI_6,
-	    "Core DMI",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_DMI_7,
-	    "Core DMI",
-	},
-	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_PCIE_1,
 	    "Core PCIE",
 	},
@@ -10176,6 +10200,18 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Core QPI Routing",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_DMI_2,
+	    "Core DMI",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_DMI_3,
+	    "Core DMI",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_DMI_4,
+	    "Core DMI",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_MANAGEMENT,
 	    "Core Management",
 	},