From owner-p4-projects@FreeBSD.ORG  Sat Feb 10 03:32:10 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8926716A4DC; Sat, 10 Feb 2007 03:32:10 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 536B516A494
	for <perforce@freebsd.org>; Sat, 10 Feb 2007 03:32:10 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 461E013C48D
	for <perforce@freebsd.org>; Sat, 10 Feb 2007 03:32:10 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1A3WA7w027447
	for <perforce@freebsd.org>; Sat, 10 Feb 2007 03:32:10 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1A3WAFs027444
	for perforce@freebsd.org; Sat, 10 Feb 2007 03:32:10 GMT
	(envelope-from mjacob@freebsd.org)
Date: Sat, 10 Feb 2007 03:32:10 GMT
Message-Id: <200702100332.l1A3WAFs027444@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114336 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Feb 2007 03:32:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=114336

Change 114336 by mjacob@mjexp on 2007/02/10 03:31:41

	Add putative untested 2432 (PCI-E) support.

Affected files ...

.. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#9 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/isp/isp_pci.c#9 (text+ko) ====

@@ -259,6 +259,10 @@
 #define	PCI_PRODUCT_QLOGIC_ISP2422	0x2422
 #endif
 
+#ifndef	PCI_PRODUCT_QLOGIC_ISP2432
+#define	PCI_PRODUCT_QLOGIC_ISP2432	0x2432
+#endif
+
 #ifndef	PCI_PRODUCT_QLOGIC_ISP6312
 #define	PCI_PRODUCT_QLOGIC_ISP6312	0x6312
 #endif
@@ -304,6 +308,9 @@
 #define	PCI_QLOGIC_ISP2422	\
 	((PCI_PRODUCT_QLOGIC_ISP2422 << 16) | PCI_VENDOR_QLOGIC)
 
+#define	PCI_QLOGIC_ISP2432	\
+	((PCI_PRODUCT_QLOGIC_ISP2432 << 16) | PCI_VENDOR_QLOGIC)
+
 #define	PCI_QLOGIC_ISP6312	\
 	((PCI_PRODUCT_QLOGIC_ISP6312 << 16) | PCI_VENDOR_QLOGIC)
 
@@ -400,6 +407,9 @@
 	case PCI_QLOGIC_ISP2422:
 		device_set_desc(dev, "Qlogic ISP 2422 PCI FC-AL Adapter");
 		break;
+	case PCI_QLOGIC_ISP2432:
+		device_set_desc(dev, "Qlogic ISP 2432 PCI FC-AL Adapter");
+		break;
 	case PCI_QLOGIC_ISP6312:
 		device_set_desc(dev, "Qlogic ISP 6312 PCI FC-AL Adapter");
 		break;
@@ -957,7 +967,8 @@
 		pcs->pci_poff[MBOX_BLOCK >> _BLK_REG_SHFT] =
 		    PCI_MBOX_REGS2300_OFF;
 	}
-	if (pci_get_devid(dev) == PCI_QLOGIC_ISP2422) {
+	if (pci_get_devid(dev) == PCI_QLOGIC_ISP2422 ||
+	    pci_get_devid(dev) == PCI_QLOGIC_ISP2432) {
 		mdvp = &mdvec_2400;
 		basetype = ISP_HA_FC_2400;
 		psize = sizeof (fcparam);