From ca7d24aabb54dbf2b760d20554df9a2d5478ccfd Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@cvs.openbsd.org>
Date: Fri, 8 Apr 2005 02:07:50 +0000
Subject: recognize Dell OEM 2312 card.

From FreeBSD
---
 sys/dev/pci/isp_pci.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 937609b72e0..81555942185 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isp_pci.c,v 1.35 2003/12/06 14:40:33 grange Exp $	*/
+/*	$OpenBSD: isp_pci.c,v 1.36 2005/04/08 02:07:49 brad Exp $	*/
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  *
@@ -249,6 +249,10 @@ static struct ispmdvec mdvec_2300 = {
 #define	PCI_PRODUCT_QLOGIC_ISP2312	0x2312
 #endif
 
+#ifndef	PCI_PRODUCT_QLOGIC_ISP6312
+#define	PCI_PRODUCT_QLOGIC_ISP6312	0x6312
+#endif
+
 #define	PCI_QLOGIC_ISP	((PCI_PRODUCT_QLOGIC_ISP1020 << 16) | PCI_VENDOR_QLOGIC)
 
 #define	PCI_QLOGIC_ISP1080	\
@@ -277,6 +281,10 @@ static struct ispmdvec mdvec_2300 = {
 
 #define	PCI_QLOGIC_ISP2312	\
 	((PCI_PRODUCT_QLOGIC_ISP2312 << 16) | PCI_VENDOR_QLOGIC)
+
+#define	PCI_QLOGIC_ISP6312	\
+	((PCI_PRODUCT_QLOGIC_ISP6312 << 16) | PCI_VENDOR_QLOGIC)
+
 /*
  * Odd case for some AMI raid cards... We need to *not* attach to this.
  */
@@ -347,6 +355,7 @@ const struct pci_matchid ispdev[] = {
 #ifndef	ISP_DISABLE_2300_SUPPORT
 	{ PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP2300 },
 	{ PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP2312 },
+	{ PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP6312 },
 #endif
 	{ 0, 0 }
 };
@@ -581,7 +590,8 @@ isp_pci_attach(struct device *parent, struct device *self, void *aux)
 #endif
 #ifndef	ISP_DISABLE_2300_SUPPORT
 	if (pa->pa_id == PCI_QLOGIC_ISP2300 ||
-	    pa->pa_id == PCI_QLOGIC_ISP2312) {
+	    pa->pa_id == PCI_QLOGIC_ISP2312 ||
+	    pa->pa_id == PCI_QLOGIC_ISP6312) {
 		isp->isp_mdvec = &mdvec_2300;
 		if (pa->pa_id  == PCI_QLOGIC_ISP2300) {
 			isp->isp_type = ISP_HA_FC_2300;
-- 
cgit v1.2.3