sync

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index e3bd74b..aa148a9 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.1965 2021/04/17 14:28:58 deraadt Exp 
+ *     OpenBSD: pcidevs,v 1.1966 2021/04/18 00:17:22 deraadt Exp 
  */
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
 
@@ -395,7 +395,7 @@
 #define        PCI_PRODUCT_3COM_3C985  0x0001          /* 3c985 */
 #define        PCI_PRODUCT_3COM_3C996  0x0003          /* 3c996 */
 #define        PCI_PRODUCT_3COM_3CRDAG675      0x0013          /* 3CRDAG675 */
-#define        PCI_PRODUCT_3COM_3C_MPCI_MODEM  0x1007          /* V.90 Modem */
+#define        PCI_PRODUCT_3COM_3C_MPCI_MODEM  0x1007          /* Modem */
 #define        PCI_PRODUCT_3COM_3C940  0x1700          /* 3c940 */
 #define        PCI_PRODUCT_3COM_3C339  0x3390          /* 3c339 */
 #define        PCI_PRODUCT_3COM_3C359  0x3590          /* 3c359 */
@@ -414,9 +414,9 @@
 #define        PCI_PRODUCT_3COM_3C556B 0x6056          /* 3c556B */
 #define        PCI_PRODUCT_3COM_3CCFEM656      0x6560          /* 3CCFEM656 */
 #define        PCI_PRODUCT_3COM_3CCFEM656B     0x6562          /* 3CCFEM656B */
-#define        PCI_PRODUCT_3COM_MODEM56        0x6563          /* 56k Modem */
+#define        PCI_PRODUCT_3COM_MODEM56        0x6563          /* Modem */
 #define        PCI_PRODUCT_3COM_3CCFEM656C     0x6564          /* 3CCFEM656C */
-#define        PCI_PRODUCT_3COM_GLOBALMODEM56  0x6565          /* 56k Global Modem */
+#define        PCI_PRODUCT_3COM_GLOBALMODEM56  0x6565          /* Modem */
 #define        PCI_PRODUCT_3COM_3CSOHO100TX    0x7646          /* 3cSOHO-TX */
 #define        PCI_PRODUCT_3COM_3CRWE777A      0x7770          /* 3crwe777a AirConnect */
 #define        PCI_PRODUCT_3COM_3C940B 0x80eb          /* 3c940B */
@@ -2691,10 +2691,10 @@
 #define        PCI_PRODUCT_COMPEX_98713        0x9881          /* PMAC 98713 */
 
 /* Conexant products */
-#define        PCI_PRODUCT_CONEXANT_56K_WINMODEM       0x1033          /* 56k Winmodem */
-#define        PCI_PRODUCT_CONEXANT_56K_WINMODEM2      0x1036          /* 56k Winmodem */
+#define        PCI_PRODUCT_CONEXANT_56K_WINMODEM       0x1033          /* Winmodem */
+#define        PCI_PRODUCT_CONEXANT_56K_WINMODEM2      0x1036          /* Winmodem */
 #define        PCI_PRODUCT_CONEXANT_RS7112     0x1803          /* RS7112 */
-#define        PCI_PRODUCT_CONEXANT_56K_WINMODEM3      0x1804          /* 56k Winmodem */
+#define        PCI_PRODUCT_CONEXANT_56K_WINMODEM3      0x1804          /* Winmodem */
 #define        PCI_PRODUCT_CONEXANT_SOFTK56_PCI        0x2443          /* SoftK56 PCI */
 #define        PCI_PRODUCT_CONEXANT_HSF_56K_HSFI       0x2f00          /* HSF 56k HSFi */
 #define        PCI_PRODUCT_CONEXANT_MUSYCC8471 0x8471          /* MUSYCC CN8471 */
@@ -2982,7 +2982,7 @@
 #define        PCI_PRODUCT_ESSTECH_ES1983      0x1999          /* ES1983 Modem */
 #define        PCI_PRODUCT_ESSTECH_MAESTRO3_2  0x199a          /* Maestro 3 Audio */
 #define        PCI_PRODUCT_ESSTECH_ES336H_N    0x2808          /* ES366H Fax/Modem */
-#define        PCI_PRODUCT_ESSTECH_SUPERLINK   0x2838          /* ES2838/2839 SuperLink Modem */
+#define        PCI_PRODUCT_ESSTECH_SUPERLINK   0x2838          /* ES2838/2839 Modem */
 #define        PCI_PRODUCT_ESSTECH_2898        0x2898          /* ES2898 Modem */
 
 /* Etron products */
@@ -3227,9 +3227,9 @@
 #define        PCI_PRODUCT_INITIO_INIC950      0x9500          /* INIC-950 */
 
 /* InnoTek Systemberatung GmbH */
-#define        PCI_PRODUCT_INNOTEK_VBNVME      0x4e56          /* VirtualBox NVMe */
-#define        PCI_PRODUCT_INNOTEK_VBGA        0xbeef          /* VirtualBox Graphics Adapter */
-#define        PCI_PRODUCT_INNOTEK_VBGS        0xcafe          /* VirtualBox Guest Service */
+#define        PCI_PRODUCT_INNOTEK_VBNVME      0x4e56          /* NVMe */
+#define        PCI_PRODUCT_INNOTEK_VBGA        0xbeef          /* Graphics Adapter */
+#define        PCI_PRODUCT_INNOTEK_VBGS        0xcafe          /* Guest Service */
 
 /* INPROCOMM products */
 #define        PCI_PRODUCT_INPROCOMM_IPN2120   0x2120          /* IPN2120 */
@@ -3678,7 +3678,7 @@
 #define        PCI_PRODUCT_INTEL_BAYTRAIL_EMMC 0x0f50          /* Bay Trail eMMC */
 #define        PCI_PRODUCT_INTEL_82542 0x1000          /* 82542 */
 #define        PCI_PRODUCT_INTEL_82543GC_FIBER 0x1001          /* 82543GC */
-#define        PCI_PRODUCT_INTEL_MODEM56       0x1002          /* 56k Modem */
+#define        PCI_PRODUCT_INTEL_MODEM56       0x1002          /* Modem */
 #define        PCI_PRODUCT_INTEL_82543GC_COPPER        0x1004          /* 82543GC */
 #define        PCI_PRODUCT_INTEL_82544EI_COPPER        0x1008          /* 82544EI */
 #define        PCI_PRODUCT_INTEL_82544EI_FIBER 0x1009          /* 82544EI */
@@ -8398,7 +8398,7 @@
 #define        PCI_PRODUCT_TOSHIBA_R4X00_PCI   0x102f          /* R4x00 PCI */
 
 /* Toshiba(2) products */
-#define        PCI_PRODUCT_TOSHIBA2_BG3_NVME   0x0113          /* BG3 NVMe */
+#define        PCI_PRODUCT_TOSHIBA2_BG3_NVME   0x0113          /* NVMe */
 #define        PCI_PRODUCT_TOSHIBA2_NVME       0x0115          /* NVMe */
 #define        PCI_PRODUCT_TOSHIBA2_THB        0x0601          /* PCI */
 #define        PCI_PRODUCT_TOSHIBA2_ISA        0x0602          /* ISA */
@@ -8406,7 +8406,7 @@
 #define        PCI_PRODUCT_TOSHIBA2_TOPIC95B   0x060a          /* ToPIC95B CardBus */
 #define        PCI_PRODUCT_TOSHIBA2_TOPIC97    0x060f          /* ToPIC97 CardBus */
 #define        PCI_PRODUCT_TOSHIBA2_TOPIC100   0x0617          /* ToPIC100 CardBus */
-#define        PCI_PRODUCT_TOSHIBA2_TFIRO      0x0701          /* Fast Infrared Type O */
+#define        PCI_PRODUCT_TOSHIBA2_TFIRO      0x0701          /* Infrared */
 #define        PCI_PRODUCT_TOSHIBA2_SDCARD     0x0805          /* SD Controller */
 
 /* Transmeta products */
@@ -8898,12 +8898,12 @@
 #define        PCI_PRODUCT_WINBOND_W83C553F_1  0x0105          /* W83C553F */
 #define        PCI_PRODUCT_WINBOND_W83C553F_0  0x0565          /* W83C553F ISA */
 #define        PCI_PRODUCT_WINBOND_W89C840F    0x0840          /* W89C840F */
-#define        PCI_PRODUCT_WINBOND_W89C940F    0x0940          /* Linksys EtherPCI II */
+#define        PCI_PRODUCT_WINBOND_W89C940F    0x0940          /* Ethernet */
 #define        PCI_PRODUCT_WINBOND_W89C940F_1  0x5a5a          /* W89C940F */
 #define        PCI_PRODUCT_WINBOND_W6692       0x6692          /* W6692 ISDN */
 
 /* Winbond Electronics products (PCI products set 2) */
-#define        PCI_PRODUCT_WINBOND2_W89C940    0x1980          /* Linksys EtherPCI */
+#define        PCI_PRODUCT_WINBOND2_W89C940    0x1980          /* Ethernet */
 
 /* Workbit products */
 #define        PCI_PRODUCT_WORKBIT_CF32A_1     0xf021          /* CF32A */
@@ -8923,12 +8923,12 @@
 #define        PCI_PRODUCT_XIRCOM_CARDBUS_ETH_1        0x0005          /* Ethernet */
 #define        PCI_PRODUCT_XIRCOM_CARDBUS_ETH_2        0x0007          /* Ethernet */
 #define        PCI_PRODUCT_XIRCOM_CARDBUS_ETH_3        0x000b          /* Ethernet */
-#define        PCI_PRODUCT_XIRCOM_MPCI_MODEM_V90       0x000c          /* V.90 56k Modem */
+#define        PCI_PRODUCT_XIRCOM_MPCI_MODEM_V90       0x000c          /* Modem */
 #define        PCI_PRODUCT_XIRCOM_CARDBUS_ETH_4        0x000f          /* Ethernet */
-#define        PCI_PRODUCT_XIRCOM_MPCI_MODEM_K56       0x00d4          /* K56Flex Modem */
-#define        PCI_PRODUCT_XIRCOM_MODEM_56K    0x0101          /* 56k Modem */
-#define        PCI_PRODUCT_XIRCOM_MODEM56      0x0103          /* 56k Modem */
-#define        PCI_PRODUCT_XIRCOM_CBEM56G      0x0105          /* CBEM56G Modem */
+#define        PCI_PRODUCT_XIRCOM_MPCI_MODEM_K56       0x00d4          /* Modem */
+#define        PCI_PRODUCT_XIRCOM_MODEM_56K    0x0101          /* Modem */
+#define        PCI_PRODUCT_XIRCOM_MODEM56      0x0103          /* Modem */
+#define        PCI_PRODUCT_XIRCOM_CBEM56G      0x0105          /* Modem */
 
 /* Yamaha products */
 #define        PCI_PRODUCT_YAMAHA_YMF724       0x0004          /* 724 */

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 1a94da1..bb1f77d 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.1965 2021/04/17 14:28:58 deraadt Exp 
+ *     OpenBSD: pcidevs,v 1.1966 2021/04/18 00:17:22 deraadt Exp 
  */
 
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
@@ -65,7 +65,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C_MPCI_MODEM,
-           "V.90 Modem",
+           "Modem",
        },
        {
            PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C940,
@@ -141,7 +141,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_3COM, PCI_PRODUCT_3COM_MODEM56,
-           "56k Modem",
+           "Modem",
        },
        {
            PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CCFEM656C,
@@ -149,7 +149,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_3COM, PCI_PRODUCT_3COM_GLOBALMODEM56,
-           "56k Global Modem",
+           "Modem",
        },
        {
            PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CSOHO100TX,
@@ -8661,11 +8661,11 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_56K_WINMODEM,
-           "56k Winmodem",
+           "Winmodem",
        },
        {
            PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_56K_WINMODEM2,
-           "56k Winmodem",
+           "Winmodem",
        },
        {
            PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_RS7112,
@@ -8673,7 +8673,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_56K_WINMODEM3,
-           "56k Winmodem",
+           "Winmodem",
        },
        {
            PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_SOFTK56_PCI,
@@ -9581,7 +9581,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_SUPERLINK,
-           "ES2838/2839 SuperLink Modem",
+           "ES2838/2839 Modem",
        },
        {
            PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_2898,
@@ -10337,15 +10337,15 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_INNOTEK, PCI_PRODUCT_INNOTEK_VBNVME,
-           "VirtualBox NVMe",
+           "NVMe",
        },
        {
            PCI_VENDOR_INNOTEK, PCI_PRODUCT_INNOTEK_VBGA,
-           "VirtualBox Graphics Adapter",
+           "Graphics Adapter",
        },
        {
            PCI_VENDOR_INNOTEK, PCI_PRODUCT_INNOTEK_VBGS,
-           "VirtualBox Guest Service",
+           "Guest Service",
        },
        {
            PCI_VENDOR_INPROCOMM, PCI_PRODUCT_INPROCOMM_IPN2120,
@@ -12125,7 +12125,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MODEM56,
-           "56k Modem",
+           "Modem",
        },
        {
            PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_COPPER,
@@ -29869,7 +29869,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_BG3_NVME,
-           "BG3 NVMe",
+           "NVMe",
        },
        {
            PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_NVME,
@@ -29901,7 +29901,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_TFIRO,
-           "Fast Infrared Type O",
+           "Infrared",
        },
        {
            PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_SDCARD,
@@ -31685,7 +31685,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_WINBOND, PCI_PRODUCT_WINBOND_W89C940F,
-           "Linksys EtherPCI II",
+           "Ethernet",
        },
        {
            PCI_VENDOR_WINBOND, PCI_PRODUCT_WINBOND_W89C940F_1,
@@ -31697,7 +31697,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_WINBOND2, PCI_PRODUCT_WINBOND2_W89C940,
-           "Linksys EtherPCI",
+           "Ethernet",
        },
        {
            PCI_VENDOR_WORKBIT, PCI_PRODUCT_WORKBIT_CF32A_1,
@@ -31745,7 +31745,7 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MPCI_MODEM_V90,
-           "V.90 56k Modem",
+           "Modem",
        },
        {
            PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_CARDBUS_ETH_4,
@@ -31753,19 +31753,19 @@ static const struct pci_known_product pci_known_products[] = {
        },
        {
            PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MPCI_MODEM_K56,
-           "K56Flex Modem",
+           "Modem",
        },
        {
            PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MODEM_56K,
-           "56k Modem",
+           "Modem",
        },
        {
            PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MODEM56,
-           "56k Modem",
+           "Modem",
        },
        {
            PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_CBEM56G,
-           "CBEM56G Modem",
+           "Modem",
        },
        {
            PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF724,