diff options
| author |   marco <marco@openbsd.org> | 2004-05-21 20:29:44 +0000 |
|---|---|---|
| committer | marco <marco@openbsd.org> | 2004-05-21 20:29:44 +0000 |
| commit | 547673b7049acfb18eb9bdf16569ae89e3ad74c4 (patch) | |
| tree | 771f6300277fc9096a9ba1187c717f16ee73c4a0 | |
| parent | Remove accidentally added .info file. (diff) | |
| download | wireguard-openbsd-547673b7049acfb18eb9bdf16569ae89e3ad74c4.tar.xz wireguard-openbsd-547673b7049acfb18eb9bdf16569ae89e3ad74c4.zip | |
Add support for Dell CERC SATA. ok krw@, henning@ & deraadt@
| -rw-r--r-- | sys/dev/ic/aac_tables.h | 3 | ||||
| -rw-r--r-- | sys/dev/ic/aacreg.h | 3 | ||||
| -rw-r--r-- | sys/dev/pci/aac_pci.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/ic/aac_tables.h b/sys/dev/ic/aac_tables.h index ea535ea12ba..c0fedc3ca60 100644 --- a/sys/dev/ic/aac_tables.h +++ b/sys/dev/ic/aac_tables.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aac_tables.h,v 1.1 2000/11/10 09:39:35 niklas Exp $ */ +/* $OpenBSD: aac_tables.h,v 1.2 2004/05/21 20:34:52 marco Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -86,6 +86,7 @@ static struct aac_code_lookup aac_cpu_variant[] = { { "PowerPC 603e", CPUPPC_603e }, { "Unknown StrongARM", CPUARM_xxx }, { "Unknown PowerPC", CPUPPC_xxx }, + { "Intel GC80302 IOP", CPUI960_302}, { NULL, 0 }, { "Unknown processor", 0 } }; diff --git a/sys/dev/ic/aacreg.h b/sys/dev/ic/aacreg.h index 08d5bafce56..1a66fa1a28a 100644 --- a/sys/dev/ic/aacreg.h +++ b/sys/dev/ic/aacreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aacreg.h,v 1.5 2003/11/16 20:30:06 avsm Exp $ */ +/* $OpenBSD: aacreg.h,v 1.6 2004/05/21 20:34:52 marco Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -248,6 +248,7 @@ typedef enum { CPUARM_xxx, CPUPPC_603e, CPUPPC_xxx, + CPUI960_302, CPUSUBTYPE__last } AAC_CpuSubType; diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c index d66360ce34d..3a1667aa620 100644 --- a/sys/dev/pci/aac_pci.c +++ b/sys/dev/pci/aac_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac_pci.c,v 1.10 2004/05/19 11:51:56 henning Exp $ */ +/* $OpenBSD: aac_pci.c,v 1.11 2004/05/21 20:33:39 marco Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -96,6 +96,9 @@ struct aac_ident { PCI_PRODUCT_DELL_PERC_3SI, AAC_HWIF_I960RX }, { PCI_VENDOR_DELL, PCI_PRODUCT_DELL_PERC_3SI_2, PCI_VENDOR_DELL, PCI_PRODUCT_DELL_PERC_3SI_2_SUB, AAC_HWIF_I960RX }, + /* Adaptec CERC-SATA */ + { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_ASR2200S, PCI_VENDOR_DELL, + PCI_PRODUCT_ADP2_AACCERCSATA, AAC_HWIF_I960RX }, /* Adaptec ADP-2622 */ { PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AAC2622, PCI_VENDOR_ADP2, PCI_PRODUCT_ADP2_AAC2622, AAC_HWIF_I960RX }, diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 22e18228ede..2fb8e8268a4 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.737 2004/05/18 18:24:49 marco Exp $ +$OpenBSD: pcidevs,v 1.738 2004/05/21 20:29:44 marco Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -453,6 +453,7 @@ product ADP2 AIC7899 0x00cf AIC-7899 U160 product ADP2 AAC2622 0x0282 AAC-2622 product ADP2 ASR2200S 0x0285 ASR-2200S product ADP2 ASR2120S 0x0286 ASR-2120S +product ADP2 AACCERCSATA 0x0291 DELL CERC-SATA product ADP2 AAC364 0x0364 AAC-364 product ADP2 AAC3642 0x0365 AAC-3642 product ADP2 PERC_2QC 0x1364 Dell PERC 2/QC |