regen

2 files changed, 56 insertions, 21 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 313c74e73a0..ebba553668b 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.1647 2012/06/29 14:37:19 jasper Exp 
+ *	OpenBSD: pcidevs,v 1.1648 2012/07/03 11:16:51 jsg Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -2345,11 +2345,11 @@
 #define	PCI_PRODUCT_INTEL_21145	0x0039		/* 21145 */
 #define	PCI_PRODUCT_INTEL_CORE_HB_0	0x0040		/* Core Host */
 #define	PCI_PRODUCT_INTEL_CORE_PCIE_0	0x0041		/* Core PCIE */
-#define	PCI_PRODUCT_INTEL_CLARKDALE_IGD	0x0042		/* HD graphics */
+#define	PCI_PRODUCT_INTEL_CLARKDALE_IGD	0x0042		/* HD Graphics */
 #define	PCI_PRODUCT_INTEL_CORE_PCIE_1	0x0043		/* Core PCIE */
 #define	PCI_PRODUCT_INTEL_CORE_HB_1	0x0044		/* Core Host */
 #define	PCI_PRODUCT_INTEL_3400_PCIE	0x0045		/* 3400 PCIE */
-#define	PCI_PRODUCT_INTEL_ARRANDALE_IGD	0x0046		/* Mobile HD graphics */
+#define	PCI_PRODUCT_INTEL_ARRANDALE_IGD	0x0046		/* HD Graphics */
 #define	PCI_PRODUCT_INTEL_WL_6005_1	0x0082		/* Centrino Advanced-N 6205 */
 #define	PCI_PRODUCT_INTEL_WL_1000_1	0x0083		/* WiFi Link 1000 */
 #define	PCI_PRODUCT_INTEL_WL_1000_2	0x0084		/* WiFi Link 1000 */
@@ -2362,18 +2362,25 @@
 #define	PCI_PRODUCT_INTEL_WL_6030_2	0x0091		/* Centrino Advanced-N 6030 */
 #define	PCI_PRODUCT_INTEL_CORE2G_HB	0x0100		/* Core 2G Host */
 #define	PCI_PRODUCT_INTEL_CORE2G_PCIE_1	0x0101		/* Core 2G PCIE */
-#define	PCI_PRODUCT_INTEL_CORE2G_GT1	0x0102		/* GT1 Video */
+#define	PCI_PRODUCT_INTEL_CORE2G_GT1	0x0102		/* HD Graphics 2000 */
 #define	PCI_PRODUCT_INTEL_CORE2G_M_HB	0x0104		/* Core 2G Host */
 #define	PCI_PRODUCT_INTEL_CORE2G_PCIE_2	0x0105		/* Core 2G PCIE */
-#define	PCI_PRODUCT_INTEL_CORE2G_M_GT1	0x0106		/* GT1 Video */
+#define	PCI_PRODUCT_INTEL_CORE2G_M_GT1	0x0106		/* HD Graphics 2000 */
 #define	PCI_PRODUCT_INTEL_XEONE3_1200_HB	0x0108		/* Xeon E3-1200 Host */
 #define	PCI_PRODUCT_INTEL_CORE2G_PCIE_3	0x0109		/* Core 2G PCIE */
+#define	PCI_PRODUCT_INTEL_CORE2G_S_GT	0x010a		/* HD Graphics P3000 */
 #define	PCI_PRODUCT_INTEL_CORE2G_PCIE_4	0x010d		/* Core 2G PCIE */
-#define	PCI_PRODUCT_INTEL_CORE2G_GT2	0x0112		/* GT2 Video */
-#define	PCI_PRODUCT_INTEL_CORE2G_M_GT2	0x0116		/* GT2 Video */
-#define	PCI_PRODUCT_INTEL_CORE2G_GT2_PLUS	0x0122		/* GT2+ Video */
-#define	PCI_PRODUCT_INTEL_CORE2G_M_GT2_PLUS	0x0126		/* GT2+ Video */
+#define	PCI_PRODUCT_INTEL_CORE2G_GT2	0x0112		/* HD Graphics 3000 */
+#define	PCI_PRODUCT_INTEL_CORE2G_M_GT2	0x0116		/* HD Graphics 3000 */
+#define	PCI_PRODUCT_INTEL_CORE2G_GT2_PLUS	0x0122		/* HD Graphics 3000 */
+#define	PCI_PRODUCT_INTEL_CORE2G_M_GT2_PLUS	0x0126		/* HD Graphics 3000 */
+#define	PCI_PRODUCT_INTEL_CORE3G_D_GT1	0x0152		/* HD Graphics 2500 */
 #define	PCI_PRODUCT_INTEL_CORE3G_M_HB	0x0154		/* Core 3G Host */
+#define	PCI_PRODUCT_INTEL_CORE3G_M_GT1	0x0156		/* HD Graphics 2500 */
+#define	PCI_PRODUCT_INTEL_CORE3G_S_GT1	0x015a		/* HD Graphics 2500 */
+#define	PCI_PRODUCT_INTEL_CORE3G_D_GT2	0x0162		/* HD Graphics 4000 */
+#define	PCI_PRODUCT_INTEL_CORE3G_M_GT2	0x0166		/* HD Graphics 4000 */
+#define	PCI_PRODUCT_INTEL_CORE3G_S_GT2	0x016a		/* HD Graphics P4000 */
 #define	PCI_PRODUCT_INTEL_80303	0x0309		/* 80303 IOP */
 #define	PCI_PRODUCT_INTEL_80312	0x030d		/* 80312 I/O Companion */
 #define	PCI_PRODUCT_INTEL_IOXAPIC_A	0x0326		/* IOxAPIC */
@@ -2947,7 +2954,7 @@
 #define	PCI_PRODUCT_INTEL_82801GH_LPC	0x27b0		/* 82801GH LPC */
 #define	PCI_PRODUCT_INTEL_82801GB_LPC	0x27b8		/* 82801GB LPC */
 #define	PCI_PRODUCT_INTEL_82801GBM_LPC	0x27b9		/* 82801GBM LPC */
-#define	PCI_PRODUCT_INTEL_TIGER_LPC	0x27bc		/* Tigerpoint LPC */
+#define	PCI_PRODUCT_INTEL_NM10_LPC	0x27bc		/* NM10 LPC */
 #define	PCI_PRODUCT_INTEL_82801GHM_LPC	0x27bd		/* 82801GHM LPC */
 #define	PCI_PRODUCT_INTEL_82801GB_SATA	0x27c0		/* 82801GB SATA */
 #define	PCI_PRODUCT_INTEL_82801GR_AHCI	0x27c1		/* 82801GR AHCI */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index d97ef4275e7..31f46d65f62 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.1647 2012/06/29 14:37:19 jasper Exp 
+ *	OpenBSD: pcidevs,v 1.1648 2012/07/03 11:16:51 jsg Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -6977,7 +6977,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CLARKDALE_IGD,
-	    "HD graphics",
+	    "HD Graphics",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE_PCIE_1,
@@ -6993,7 +6993,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ARRANDALE_IGD,
-	    "Mobile HD graphics",
+	    "HD Graphics",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_6005_1,
@@ -7045,7 +7045,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_GT1,
-	    "GT1 Video",
+	    "HD Graphics 2000",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_M_HB,
@@ -7057,7 +7057,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_M_GT1,
-	    "GT1 Video",
+	    "HD Graphics 2000",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_XEONE3_1200_HB,
@@ -7068,30 +7068,58 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Core 2G PCIE",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_S_GT,
+	    "HD Graphics P3000",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_PCIE_4,
 	    "Core 2G PCIE",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_GT2,
-	    "GT2 Video",
+	    "HD Graphics 3000",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_M_GT2,
-	    "GT2 Video",
+	    "HD Graphics 3000",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_GT2_PLUS,
-	    "GT2+ Video",
+	    "HD Graphics 3000",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE2G_M_GT2_PLUS,
-	    "GT2+ Video",
+	    "HD Graphics 3000",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE3G_D_GT1,
+	    "HD Graphics 2500",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE3G_M_HB,
 	    "Core 3G Host",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE3G_M_GT1,
+	    "HD Graphics 2500",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE3G_S_GT1,
+	    "HD Graphics 2500",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE3G_D_GT2,
+	    "HD Graphics 4000",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE3G_M_GT2,
+	    "HD Graphics 4000",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE3G_S_GT2,
+	    "HD Graphics P4000",
+	},
+	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80303,
 	    "80303 IOP",
 	},
@@ -9384,8 +9412,8 @@ static const struct pci_known_product pci_known_products[] = {
 	    "82801GBM LPC",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_TIGER_LPC,
-	    "Tigerpoint LPC",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_NM10_LPC,
+	    "NM10 LPC",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801GHM_LPC,