diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2000-01-18 05:26:26 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2000-01-18 05:26:26 +0000 |
| commit | 086378d0b701b65b3417a83946da22b3aef0cdbf (patch) | |
| tree | cd143c59dc9ebafcd640885024d13b7227816202 /sys | |
| parent | 25f06ea435468067cb3b2e0e9a70ac01a98bc0f7 (diff) | |
sync with FreeBSD: add Farallon PN9000SX as a match
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_ti.c | 9 | ||||
| -rw-r--r-- | sys/dev/pci/if_tireg.h | 11 |
2 files changed, 16 insertions, 4 deletions
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index 32df24a58e1..7bf0965d3a3 100644 --- a/sys/dev/pci/if_ti.c +++ b/sys/dev/pci/if_ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ti.c,v 1.8 1999/10/28 03:26:33 jason Exp $ */ +/* $OpenBSD: if_ti.c,v 1.9 2000/01/18 05:26:25 jason Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -31,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_ti.c,v 1.24 1999/09/23 03:32:54 wpaul Exp $ + * $FreeBSD: src/sys/pci/if_ti.c,v 1.25 2000/01/18 00:26:29 wpaul Exp $ */ /* @@ -1503,6 +1503,11 @@ ti_probe(parent, match, aux) PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_SGI_TIGON) return (1); + /* This is really a Farallon board, they used the wrong vendorid */ + if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_DEC && + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_DEC_PN9000SX) + return (1); + return (0); } diff --git a/sys/dev/pci/if_tireg.h b/sys/dev/pci/if_tireg.h index a7ecc842fe8..98407d75d78 100644 --- a/sys/dev/pci/if_tireg.h +++ b/sys/dev/pci/if_tireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tireg.h,v 1.4 1999/10/25 19:39:19 jason Exp $ */ +/* $OpenBSD: if_tireg.h,v 1.5 2000/01/18 05:26:25 jason Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -31,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_tireg.h,v 1.11 1999/09/22 06:43:16 wpaul Exp $ + * $FreeBSD: src/sys/pci/if_tireg.h,v 1.12 2000/01/18 00:26:29 wpaul Exp $ */ /* @@ -82,6 +82,13 @@ #define SGI_DEVICEID_TIGON 0x0009 /* + * DEC vendor ID, Farallon device ID. Apparently, Farallon used + * the DEC vendor ID in their cards by mistake. + */ +#define DEC_VENDORID 0x1011 +#define DEC_DEVICEID_FARALLON_PN9000SX 0x001a + +/* * Tigon configuration and control registers. */ #define TI_MISC_HOST_CTL 0x040 |