sync

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 563c759..2bde05d 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.232 2000/03/28 00:02:08 deraadt Exp 
+ *             OpenBSD: pcidevs,v 1.234 2000/03/28 01:20:14 deraadt Exp 
  */
 
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
@@ -685,7 +685,7 @@
 #define        PCI_PRODUCT_AMD_SC751_SC        0x7006          /* 751 System Controller */
 #define        PCI_PRODUCT_AMD_SC751_PPB       0x7007          /* 751 PCI-PCI */
 /* http://www.amd.com/products/cpg/athlon/techdocs/pdf/22548.pdf */
-#define        PCI_PRODUCT_AMD_PBC756_ISA      0x7408          /* 756 PCI-to-ISA Bridge */
+#define        PCI_PRODUCT_AMD_PBC756_ISA      0x7408          /* 756 PCI-ISA */
 #define        PCI_PRODUCT_AMD_PBC756_IDE      0x7409          /* 756 IDE */
 #define        PCI_PRODUCT_AMD_PBC756_PMC      0x740B          /* 756 Power Management */
 #define        PCI_PRODUCT_AMD_PBC756_USB      0x740C          /* 756 USB Host */
@@ -1339,7 +1339,7 @@
 #define        PCI_PRODUCT_SIS_5582    0x5582          /* 5582 */
 #define        PCI_PRODUCT_SIS_5591    0x5591          /* 5591 Host-PCI */
 #define        PCI_PRODUCT_SIS_5596    0x5596          /* 5596 */
-#define        PCI_PRODUCT_SIS_5597    0x5597          /* 5597 Host Bridge */
+#define        PCI_PRODUCT_SIS_5597    0x5597          /* 5597 Host */
 #define        PCI_PRODUCT_SIS_5598    0x5598          /* 5598 */
 #define        PCI_PRODUCT_SIS_6204    0x6204          /* 6204 */
 #define        PCI_PRODUCT_SIS_6205    0x6205          /* 6205 */
@@ -1472,7 +1472,7 @@
 #define        PCI_PRODUCT_V3_V96DPC   0xC960          /* V96DPC i960 (Dual) Host-PCI */
 
 /* VIA Technologies products */
-#define        PCI_PRODUCT_VIATECH_VT8371_HB   0x0391          /* VT8371 (Apollo 133) Host Bridge */
+#define        PCI_PRODUCT_VIATECH_VT8371_HB   0x0391          /* VT8371 (Apollo 133) Host */
 #define        PCI_PRODUCT_VIATECH_VT82C505    0x0505          /* VT82C505 (Pluto) */
 #define        PCI_PRODUCT_VIATECH_VT82C561    0x0561          /* VT82C561 */
 #define        PCI_PRODUCT_VIATECH_VT82C586A_IDE       0x0571          /* VT82C586A IDE */
@@ -1482,7 +1482,7 @@
 #define        PCI_PRODUCT_VIATECH_VT82C595    0x0595          /* VT82C595 (Apollo VP2) Host-PCI */
 #define        PCI_PRODUCT_VIATECH_VT82C597PCI 0x0597          /* VT82C597 (Apollo VP3) Host-PCI */
 #define        PCI_PRODUCT_VIATECH_VT82C598PCI 0x0598          /* VT82C598 (Apollo MVP3) Host-PCI */
-#define        PCI_PRODUCT_VIATECH_VT82C686A_ISA       0x0686          /* VT82C686A (Apollo 133) PCI-ISA Bridge */
+#define        PCI_PRODUCT_VIATECH_VT82C686A_ISA       0x0686          /* VT82C686A (Apollo 133) PCI-ISA */
 #define        PCI_PRODUCT_VIATECH_VT82C691    0x0691          /* VT82C691 (Apollo Pro) Host-PCI */
 #define        PCI_PRODUCT_VIATECH_VT82C693    0x0693          /* VT82C693 (Apollo Pro Plus) Host-PCI */
 #define        PCI_PRODUCT_VIATECH_VT86C926    0x0926          /* VT86C926 Amazon */
@@ -1492,9 +1492,9 @@
 #define        PCI_PRODUCT_VIATECH_VT82C1595   0x1595          /* VT82C1595 (Apollo VP2) Host-PCI */
 #define        PCI_PRODUCT_VIATECH_VT83C572    0x3038          /* VT83C572 USB */
 #define        PCI_PRODUCT_VIATECH_VT82C586_PWR        0x3040          /* VT82C586 (Apollo VP) Power Management */
-#define        PCI_PRODUCT_VIATECH_VT82C686A_SMB       0x3057          /* VT82C686A (Apollo 133) SMBus Controller */
-#define        PCI_PRODUCT_VIATECH_VT82C686A_AUD       0x3058          /* VT82C686A (Apollo 133) AC-97 Audio Controller */
-#define        PCI_PRODUCT_VIATECH_VT8371_PPB  0x8391          /* VT8371 (Apollo 133) PCI-PCI Bridge */
+#define        PCI_PRODUCT_VIATECH_VT82C686A_SMB       0x3057          /* VT82C686A (Apollo 133) SMBus */
+#define        PCI_PRODUCT_VIATECH_VT82C686A_AUD       0x3058          /* VT82C686A (Apollo 133) AC-97 Audio */
+#define        PCI_PRODUCT_VIATECH_VT8371_PPB  0x8391          /* VT8371 (Apollo 133) PCI-PCI */
 #define        PCI_PRODUCT_VIATECH_VT82C597AGP 0x8597          /* VT82C597 (Apollo VP3) PCI-AGP */
 #define        PCI_PRODUCT_VIATECH_VT82C598AGP 0x8598          /* VT82C598 (Apollo MVP3) PCI-AGP */
 #define        PCI_PRODUCT_VIATECH_RHINE       0x3043          /* Rhine/RhineII */

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 41daf94..1f7765f 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.232 2000/03/28 00:02:08 deraadt Exp 
+ *             OpenBSD: pcidevs,v 1.234 2000/03/28 01:20:14 deraadt Exp 
  */
 
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
@@ -642,7 +642,7 @@ struct pci_knowndev pci_knowndevs[] = {
            PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC756_ISA,
            0,
            "AMD",
-           "756 PCI-to-ISA Bridge",
+           "756 PCI-ISA",
        },
        {
            PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC756_IDE,
@@ -3426,7 +3426,7 @@ struct pci_knowndev pci_knowndevs[] = {
            PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5597,
            0,
            "SIS",
-           "5597 Host Bridge",
+           "5597 Host",
        },
        {
            PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5598,
@@ -3984,7 +3984,7 @@ struct pci_knowndev pci_knowndevs[] = {
            PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8371_HB,
            0,
            "VIA",
-           "VT8371 (Apollo 133) Host Bridge",
+           "VT8371 (Apollo 133) Host",
        },
        {
            PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C505,
@@ -4044,7 +4044,7 @@ struct pci_knowndev pci_knowndevs[] = {
            PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_ISA,
            0,
            "VIA",
-           "VT82C686A (Apollo 133) PCI-ISA Bridge",
+           "VT82C686A (Apollo 133) PCI-ISA",
        },
        {
            PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C691,
@@ -4104,19 +4104,19 @@ struct pci_knowndev pci_knowndevs[] = {
            PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_SMB,
            0,
            "VIA",
-           "VT82C686A (Apollo 133) SMBus Controller",
+           "VT82C686A (Apollo 133) SMBus",
        },
        {
            PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_AUD,
            0,
            "VIA",
-           "VT82C686A (Apollo 133) AC-97 Audio Controller",
+           "VT82C686A (Apollo 133) AC-97 Audio",
        },
        {
            PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8371_PPB,
            0,
            "VIA",
-           "VT8371 (Apollo 133) PCI-PCI Bridge",
+           "VT8371 (Apollo 133) PCI-PCI",
        },
        {
            PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C597AGP,