diff options
| author |   smurph <smurph@openbsd.org> | 2000-04-13 04:25:08 +0000 |
|---|---|---|
| committer | smurph <smurph@openbsd.org> | 2000-04-13 04:25:08 +0000 |
| commit | 204287f55c3ddae75e25aad528fd55af97985bbf (patch) | |
| tree | fd3f0c146f45719fd79a5b09bd1dd54dcf738388 | |
| parent | Remove printf from interrupt handler... (diff) | |
| download | wireguard-openbsd-204287f55c3ddae75e25aad528fd55af97985bbf.tar.xz wireguard-openbsd-204287f55c3ddae75e25aad528fd55af97985bbf.zip | |
Add support for Adaptec 2930U2 controller.
| -rw-r--r-- | sys/dev/pci/ahc_pci.c | 3 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 3 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 3 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 8 |
4 files changed, 13 insertions, 4 deletions
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index bbcc4c14324..3c2c8c0c098 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_pci.c,v 1.15 2000/04/06 18:21:42 aaron Exp $ */ +/* $OpenBSD: ahc_pci.c,v 1.16 2000/04/13 04:25:10 smurph Exp $ */ /* $NetBSD: ahc_pci.c,v 1.9 1996/10/21 22:56:24 thorpej Exp $ */ /* @@ -312,6 +312,7 @@ void *aux; switch (PCI_PRODUCT(pa->pa_id)) { case PCI_PRODUCT_ADP2_AIC7890: case PCI_PRODUCT_ADP2_2940U2: + case PCI_PRODUCT_ADP2_2930U2: ahc_c |= AHC_AIC7890; ahc_f = AHC_AIC7890_FE; ahc_flags |= AHC_NEWEEPROM_FMT; diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 56b034d53ac..75fa8ae6bdd 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ - $OpenBSD: pcidevs,v 1.244 2000/04/13 00:07:06 deraadt Exp $ + $OpenBSD: pcidevs,v 1.245 2000/04/13 04:25:08 smurph Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -653,6 +653,7 @@ product ADP AIC6915 0x6915 AIC-6915 product ADP 7895 0x7895 AIC-7895 product ADP2 2940U2 0x0010 AHA-2940U2 Ultra2 +product ADP2 2930U2 0x0011 AHA-2930U2 Ultra2 product ADP2 AIC7890 0x001f AIC-7890/1 Ultra2 product ADP2 AIC7892 0x008F AIC-7892 Ultra160 product ADP2 29160 0x0080 AHA-29160 Ultra160 diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 7913d33c20f..9977e5c8095 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.244 2000/04/13 00:07:06 deraadt Exp + * OpenBSD: pcidevs,v 1.245 2000/04/13 04:25:08 smurph Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -658,6 +658,7 @@ #define PCI_PRODUCT_ADP_7895 0x7895 /* AIC-7895 */ #define PCI_PRODUCT_ADP2_2940U2 0x0010 /* AHA-2940U2 Ultra2 */ +#define PCI_PRODUCT_ADP2_2930U2 0x0011 /* AHA-2930U2 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 */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index f3a7008ce6b..9eb073bdcf4 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.244 2000/04/13 00:07:06 deraadt Exp + * OpenBSD: pcidevs,v 1.245 2000/04/13 04:25:08 smurph Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -513,6 +513,12 @@ struct pci_knowndev pci_knowndevs[] = { "AHA-2940U2 Ultra2", }, { + PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_2930U2, + 0, + "Adaptec(2)", + "AHA-2930U2 Ultra2", + }, + { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AIC7890, 0, "Adaptec(2)", |