regen

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 8702f03..56b353e 100644 (file)
--- 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.1976 2021/09/29 10:27:21 jsg Exp 
+ *     OpenBSD: pcidevs,v 1.1977 2021/09/29 12:18:08 jsg Exp 
  */
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
 
@@ -1393,7 +1393,7 @@
 #define        PCI_PRODUCT_ATI_RADEON9600TX    0x4e46          /* Radeon 9600 TX */
 #define        PCI_PRODUCT_ATI_FIREGL_X1       0x4e47          /* FireGL X1 */
 #define        PCI_PRODUCT_ATI_R350    0x4e48          /* Radeon 9800 Pro */
-#define        PCI_PRODUCT_ATI_RADEON9800      0x4e49          /* RAdeon 9800 */
+#define        PCI_PRODUCT_ATI_RADEON9800      0x4e49          /* Radeon 9800 */
 #define        PCI_PRODUCT_ATI_RADEON_9800XT   0x4e4a          /* Radeon 9800 XT */
 #define        PCI_PRODUCT_ATI_FIREGL_X2       0x4e4b          /* FireGL X2 */
 #define        PCI_PRODUCT_ATI_RV350   0x4e50          /* Radeon Mobility M10 */
@@ -1882,7 +1882,7 @@
 #define        PCI_PRODUCT_ATI_M54_GL  0x7144          /* M54-GL */
 #define        PCI_PRODUCT_ATI_RADEON_X1400    0x7145          /* Radeon Mobility X1400 */
 #define        PCI_PRODUCT_ATI_RADEON_X1550_X1300      0x7146          /* Radeon X1300/X1550 */
-#define        PCI_PRODUCT_ATI_RADEON_X1550_64 0x7147          /* RADEON X1550 64-bit */
+#define        PCI_PRODUCT_ATI_RADEON_X1550_64 0x7147          /* Radeon X1550 64-bit */
 #define        PCI_PRODUCT_ATI_RADEON_X1300_M52        0x7149          /* Radeon Mobility X1300 M52-64 */
 #define        PCI_PRODUCT_ATI_MOBILITY_X1300_4A       0x714a          /* Radeon Mobility X1300 */
 #define        PCI_PRODUCT_ATI_MOBILITY_X1300_4B       0x714b          /* Radeon Mobility X1300 */
@@ -1959,7 +1959,7 @@
 #define        PCI_PRODUCT_ATI_RV570   0x7289          /* RV570 */
 #define        PCI_PRODUCT_ATI_RV570_2 0x728b          /* RV570 */
 #define        PCI_PRODUCT_ATI_FIREGL_V7400    0x728c          /* FireGL V7400 */
-#define        PCI_PRODUCT_ATI_RV560_3 0x7290          /* Rv560 */
+#define        PCI_PRODUCT_ATI_RV560_3 0x7290          /* RV560 */
 #define        PCI_PRODUCT_ATI_RADEON_RX1650_XT        0x7291          /* Radeon RX1650 XT */
 #define        PCI_PRODUCT_ATI_RADEON_X1650_1  0x7293          /* Radeon X1650 */
 #define        PCI_PRODUCT_ATI_RV560_4 0x7297          /* RV560 */
@@ -5515,34 +5515,34 @@
 #define        PCI_PRODUCT_INTEL_I219_LM19     0x550c          /* I219-LM */
 #define        PCI_PRODUCT_INTEL_I219_V19      0x550d          /* I219-V */
 #define        PCI_PRODUCT_INTEL_QEMU_NVME     0x5845          /* QEMU NVM Express Controller */
-#define        PCI_PRODUCT_INTEL_CORE7G_D_GT1  0x5902          /* HD Graphics 610 */
+#define        PCI_PRODUCT_INTEL_KBL_D_GT1     0x5902          /* HD Graphics 610 */
 #define        PCI_PRODUCT_INTEL_CORE7G_U_HB   0x5904          /* Core 7G Host */
-#define        PCI_PRODUCT_INTEL_CORE7G_U_GT1  0x5906          /* HD Graphics 610 */
-#define        PCI_PRODUCT_INTEL_CORE7G_H_GT1_1        0x5908          /* HD Graphics */
-#define        PCI_PRODUCT_INTEL_CORE7G_S_GT1  0x590a          /* HD Graphics */
-#define        PCI_PRODUCT_INTEL_CORE7G_H_GT1_2        0x590b          /* HD Graphics */
+#define        PCI_PRODUCT_INTEL_KBL_U_GT1     0x5906          /* HD Graphics 610 */
+#define        PCI_PRODUCT_INTEL_KBL_H_GT1_1   0x5908          /* HD Graphics */
+#define        PCI_PRODUCT_INTEL_KBL_S_GT1     0x590a          /* HD Graphics */
+#define        PCI_PRODUCT_INTEL_KBL_H_GT1_2   0x590b          /* HD Graphics */
 #define        PCI_PRODUCT_INTEL_CORE7G_Y_HB   0x590c          /* Core 7G Host */
-#define        PCI_PRODUCT_INTEL_CORE7G_Y_GT1  0x590e          /* HD Graphics */
+#define        PCI_PRODUCT_INTEL_KBL_Y_GT1     0x590e          /* HD Graphics */
 #define        PCI_PRODUCT_INTEL_CORE7G_S_HB_2C        0x590f          /* Core 7G Host */
 #define        PCI_PRODUCT_INTEL_XEONE3_1200V6_HB2     0x5910          /* Xeon E3-1200 v6/7 Host */
 #define        PCI_PRODUCT_INTEL_CORE_GMM_2    0x5911          /* Core GMM */
 #define        PCI_PRODUCT_INTEL_KBL_S_GT2     0x5912          /* HD Graphics 630 */
 #define        PCI_PRODUCT_INTEL_KBL_U_GT15    0x5913          /* HD Graphics */
 #define        PCI_PRODUCT_INTEL_CORE8G_U_HB   0x5914          /* Core 8G Host */
-#define        PCI_PRODUCT_INTEL_CORE7G_IMGU   0x5915          /* Core 7G Imaging Unit */
-#define        PCI_PRODUCT_INTEL_CORE7G_U_GT2_1        0x5916          /* HD Graphics 620 */
+#define        PCI_PRODUCT_INTEL_KBL_U_GT15_2  0x5915          /* HD Graphics */
+#define        PCI_PRODUCT_INTEL_KBL_U_GT2_1   0x5916          /* HD Graphics 620 */
 #define        PCI_PRODUCT_INTEL_KBL_U_GT2     0x5917          /* UHD Graphics 620 */
 #define        PCI_PRODUCT_INTEL_XEONE3_1200V6_HB      0x5918          /* Xeon E3-1200 v6/7 Host */
-#define        PCI_PRODUCT_INTEL_CORE7G_SRV_GT2        0x591a          /* HD Graphics P630 */
-#define        PCI_PRODUCT_INTEL_CORE7G_H_GT2  0x591b          /* HD Graphics 630 */
+#define        PCI_PRODUCT_INTEL_KBL_SRV_GT2   0x591a          /* HD Graphics P630 */
+#define        PCI_PRODUCT_INTEL_KBL_H_GT2     0x591b          /* HD Graphics 630 */
 #define        PCI_PRODUCT_INTEL_AML_KBL_Y_GT2 0x591c          /* UHD Graphics 615 */
-#define        PCI_PRODUCT_INTEL_CORE7G_U_GT2_2        0x591d          /* HD Graphics P630 */
-#define        PCI_PRODUCT_INTEL_CORE7G_Y_GT2  0x591e          /* HD Graphics 615 */
+#define        PCI_PRODUCT_INTEL_KBL_U_GT2_2   0x591d          /* HD Graphics P630 */
+#define        PCI_PRODUCT_INTEL_KBL_Y_GT2     0x591e          /* HD Graphics 615 */
 #define        PCI_PRODUCT_INTEL_CORE7G_S_HB_4C        0x591f          /* Core 7G Host */
 #define        PCI_PRODUCT_INTEL_KBL_U_GT2F    0x5921          /* HD Graphics 620 */
 #define        PCI_PRODUCT_INTEL_KBL_U_GT3     0x5923          /* HD Graphics 635 */
-#define        PCI_PRODUCT_INTEL_CORE7G_U_GT3_15W      0x5926          /* Iris Plus 640 */
-#define        PCI_PRODUCT_INTEL_CORE7G_U_GT3_28W      0x5927          /* Iris Plus 650 */
+#define        PCI_PRODUCT_INTEL_KBL_U_GT3_15W 0x5926          /* Iris Plus 640 */
+#define        PCI_PRODUCT_INTEL_KBL_U_GT3_28W 0x5927          /* Iris Plus 650 */
 #define        PCI_PRODUCT_INTEL_KBL_H_GT4     0x593b          /* HD Graphics */
 #define        PCI_PRODUCT_INTEL_APOLLOLAKE_IGD_1      0x5a84          /* HD Graphics 505 */
 #define        PCI_PRODUCT_INTEL_APOLLOLAKE_IGD_2      0x5a85          /* HD Graphics 500 */

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 801da1a..ac555b7 100644 (file)
--- 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.1976 2021/09/29 10:27:21 jsg Exp 
+ *     OpenBSD: pcidevs,v 1.1977 2021/09/29 12:18:08 jsg Exp 
  */
 
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
@@ -3725,7 +3725,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON9800,
-           "RAdeon 9800",
+           "Radeon 9800",
        },
        {
            PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_9800XT,
@@ -5681,7 +5681,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1550_64,
-           "RADEON X1550 64-bit",
+           "Radeon X1550 64-bit",
        },
        {
            PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1300_M52,
@@ -5989,7 +5989,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RV560_3,
-           "Rv560",
+           "RV560",
        },
        {
            PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RX1650_XT,
@@ -19448,7 +19448,7 @@ static const struct pci_known_product pci_known_products[] = {
            "QEMU NVM Express Controller",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_D_GT1,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_D_GT1,
            "HD Graphics 610",
        },
        {
@@ -19456,19 +19456,19 @@ static const struct pci_known_product pci_known_products[] = {
            "Core 7G Host",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT1,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_U_GT1,
            "HD Graphics 610",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_H_GT1_1,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_H_GT1_1,
            "HD Graphics",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_S_GT1,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_S_GT1,
            "HD Graphics",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_H_GT1_2,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_H_GT1_2,
            "HD Graphics",
        },
        {
@@ -19476,7 +19476,7 @@ static const struct pci_known_product pci_known_products[] = {
            "Core 7G Host",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_Y_GT1,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_Y_GT1,
            "HD Graphics",
        },
        {
@@ -19504,11 +19504,11 @@ static const struct pci_known_product pci_known_products[] = {
            "Core 8G Host",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_IMGU,
-           "Core 7G Imaging Unit",
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_U_GT15_2,
+           "HD Graphics",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT2_1,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_U_GT2_1,
            "HD Graphics 620",
        },
        {
@@ -19520,11 +19520,11 @@ static const struct pci_known_product pci_known_products[] = {
            "Xeon E3-1200 v6/7 Host",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_SRV_GT2,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_SRV_GT2,
            "HD Graphics P630",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_H_GT2,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_H_GT2,
            "HD Graphics 630",
        },
        {
@@ -19532,11 +19532,11 @@ static const struct pci_known_product pci_known_products[] = {
            "UHD Graphics 615",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT2_2,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_U_GT2_2,
            "HD Graphics P630",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_Y_GT2,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_Y_GT2,
            "HD Graphics 615",
        },
        {
@@ -19552,11 +19552,11 @@ static const struct pci_known_product pci_known_products[] = {
            "HD Graphics 635",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT3_15W,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_U_GT3_15W,
            "Iris Plus 640",
        },
        {
-           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE7G_U_GT3_28W,
+           PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_KBL_U_GT3_28W,
            "Iris Plus 650",
        },
        {