diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2003-04-02 22:33:14 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2003-04-02 22:33:14 +0000 |
| commit | f462d26dc6fb8c2d6c102de8dfd5ecf077570804 (patch) | |
| tree | c803b58f4339c9be3c6dd9ff29dad034417c3090 | |
| parent | 24f4805e5969e45e828a65100ed526b947699880 (diff) | |
add support for the other Sun Crypto 1000; from sam at errno dot com
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/ubsec.c | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 6cf35032bc4..bb4460ac944 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.611 2003/04/02 22:25:41 jason Exp + * OpenBSD: pcidevs,v 1.612 2003/04/02 22:32:04 jason Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -2242,7 +2242,7 @@ #define PCI_PRODUCT_SUN_USB 0x1103 /* USB */ #define PCI_PRODUCT_SUN_GEMNETWORK 0x2bad /* GEM */ #define PCI_PRODUCT_SUN_SIMBA 0x5000 /* Simba PCI-PCI */ -#define PCI_PRODUCT_SUN_SCA1K2 0x5454 /* Crypto 1K2 */ +#define PCI_PRODUCT_SUN_5821 0x5454 /* Crypto 5821 */ #define PCI_PRODUCT_SUN_SCA1K 0x5455 /* Crypto 1K */ #define PCI_PRODUCT_SUN_PSYCHO 0x8000 /* Psycho PCI */ #define PCI_PRODUCT_SUN_MS_IIep 0x9000 /* microSPARC IIep PCI */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index 4531961dd15..83e9fe57450 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.611 2003/04/02 22:25:41 jason Exp + * OpenBSD: pcidevs,v 1.612 2003/04/02 22:32:04 jason Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -5279,8 +5279,8 @@ static const struct pci_known_product pci_known_products[] = { "Simba PCI-PCI", }, { - PCI_VENDOR_SUN, PCI_PRODUCT_SUN_SCA1K2, - "Crypto 1K2", + PCI_VENDOR_SUN, PCI_PRODUCT_SUN_5821, + "Crypto 5821", }, { PCI_VENDOR_SUN, PCI_PRODUCT_SUN_SCA1K, diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index 848f8bd9631..f5e27864996 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsec.c,v 1.123 2003/02/14 01:28:20 jason Exp $ */ +/* $OpenBSD: ubsec.c,v 1.124 2003/04/02 22:33:13 jason Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -142,6 +142,7 @@ const struct pci_matchid ubsec_devices[] = { { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_5821 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_5822 }, { PCI_VENDOR_SUN, PCI_PRODUCT_SUN_SCA1K }, + { PCI_VENDOR_SUN, PCI_PRODUCT_SUN_5821 }, }; int @@ -196,7 +197,8 @@ ubsec_attach(parent, self, aux) if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_BROADCOM && PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_5821) || (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_SUN && - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SUN_SCA1K)) { + (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SUN_SCA1K || + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SUN_5821))) { sc->sc_statmask |= BS_STAT_MCR1_ALLEMPTY | BS_STAT_MCR2_ALLEMPTY; sc->sc_flags |= UBS_FLAGS_KEY | UBS_FLAGS_RNG | |