sync

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index d67621f..3491943 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.227 2000/03/21 22:01:06 deraadt Exp 
+ *             OpenBSD: pcidevs,v 1.228 2000/03/22 03:42:13 deraadt Exp 
  */
 
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
@@ -630,6 +630,7 @@
 
 /* Adaptec products */
 #define        PCI_PRODUCT_ADP_AIC7810 0x1078          /* AIC-7810 */
+#define        PCI_PRODUCT_ADP_2940AU_CN       0x2178          /* AHA-2940AU/CN */
 #define        PCI_PRODUCT_ADP_AIC7850 0x5078          /* AIC-7850 */
 #define        PCI_PRODUCT_ADP_AIC7855 0x5578          /* AIC-7855 */
 #define        PCI_PRODUCT_ADP_AIC5900 0x5900          /* AIC-5900 ATM */
@@ -650,10 +651,16 @@
 #define        PCI_PRODUCT_ADP_AIC6915 0x6915          /* AIC-6915 */
 #define        PCI_PRODUCT_ADP_7895    0x7895          /* AIC-7895 */
 
-#define        PCI_PRODUCT_ADP2_2940U2 0x0010          /* AHA-2940U2 */
-#define        PCI_PRODUCT_ADP2_7890   0x001f          /* AIC-7890/1 */
-#define        PCI_PRODUCT_ADP2_3940U2 0x0050          /* AHA-3940U2 */
-#define        PCI_PRODUCT_ADP2_7896   0x005f          /* AIC-7896/7 */
+#define        PCI_PRODUCT_ADP2_2940U2 0x0010          /* AHA-2940U2 Ultra2 */
+#define        PCI_PRODUCT_ADP2_AIC7890        0x001f          /* AIC-7890/1 Ultra2 */
+#define        PCI_PRODUCT_ADP2_AIC7892        0x008F          /* AIC-7892 Ultra160 */
+#define        PCI_PRODUCT_ADP2_29160  0x0080          /* AHA-29160 Ultra160 */
+#define        PCI_PRODUCT_ADP2_19160B 0x0081          /* AHA-19160B Ultra160 */
+#define        PCI_PRODUCT_ADP2_3950U2B        0x0050          /* AHA-3950U2B Ultra2 */
+#define        PCI_PRODUCT_ADP2_3950U2D        0x0051          /* AHA-3950U2D Ultra2 */
+#define        PCI_PRODUCT_ADP2_AIC7896        0x005f          /* AIC-7896/7 Ultra2 */
+#define        PCI_PRODUCT_ADP2_AIC7899        0x00CF          /* AIC-7899 Ultra160 */
+#define        PCI_PRODUCT_ADP2_3960D  0x00C0          /* AHA-3960D Ultra160 */
 
 /* Advanced System Products */
 #define        PCI_PRODUCT_ADVSYS_1200A        0x1100          /* 1200A */

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index a90370b..5d2c212 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.227 2000/03/21 22:01:06 deraadt Exp 
+ *             OpenBSD: pcidevs,v 1.228 2000/03/22 03:42:13 deraadt Exp 
  */
 
 /*     $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $       */
@@ -374,6 +374,12 @@ struct pci_knowndev pci_knowndevs[] = {
            "Adaptec",
            "AIC-7810",
        },
+       {
+           PCI_VENDOR_ADP, PCI_PRODUCT_ADP_2940AU_CN,
+           0,
+           "Adaptec",
+           "AHA-2940AU/CN",
+       },
        {
            PCI_VENDOR_ADP, PCI_PRODUCT_ADP_AIC7850,
            0,
@@ -492,25 +498,61 @@ struct pci_knowndev pci_knowndevs[] = {
            PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_2940U2,
            0,
            "Adaptec(2)",
-           "AHA-2940U2",
+           "AHA-2940U2 Ultra2",
+       },
+       {
+           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AIC7890,
+           0,
+           "Adaptec(2)",
+           "AIC-7890/1 Ultra2",
+       },
+       {
+           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AIC7892,
+           0,
+           "Adaptec(2)",
+           "AIC-7892 Ultra160",
+       },
+       {
+           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_29160,
+           0,
+           "Adaptec(2)",
+           "AHA-29160 Ultra160",
+       },
+       {
+           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_19160B,
+           0,
+           "Adaptec(2)",
+           "AHA-19160B Ultra160",
+       },
+       {
+           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_3950U2B,
+           0,
+           "Adaptec(2)",
+           "AHA-3950U2B Ultra2",
+       },
+       {
+           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_3950U2D,
+           0,
+           "Adaptec(2)",
+           "AHA-3950U2D Ultra2",
        },
        {
-           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_7890,
+           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AIC7896,
            0,
            "Adaptec(2)",
-           "AIC-7890/1",
+           "AIC-7896/7 Ultra2",
        },
        {
-           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_3940U2,
+           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AIC7899,
            0,
            "Adaptec(2)",
-           "AHA-3940U2",
+           "AIC-7899 Ultra160",
        },
        {
-           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_7896,
+           PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_3960D,
            0,
            "Adaptec(2)",
-           "AIC-7896/7",
+           "AHA-3960D Ultra160",
        },
        {
            PCI_VENDOR_ADVSYS, PCI_PRODUCT_ADVSYS_1200A,