summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/pci/if_ti.c9
-rw-r--r--sys/dev/pci/if_tireg.h11
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