From owner-p4-projects@FreeBSD.ORG  Fri Sep  8 17:27:04 2006
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 0A25E16A62D; Fri,  8 Sep 2006 17:27:04 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DBE2016A628
	for <perforce@freebsd.org>; Fri,  8 Sep 2006 17:27:03 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8E79343D60
	for <perforce@freebsd.org>; Fri,  8 Sep 2006 17:27:00 +0000 (GMT)
	(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 k88HR0ro006487
	for <perforce@freebsd.org>; Fri, 8 Sep 2006 17:27:00 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88HR0OQ006482
	for perforce@freebsd.org; Fri, 8 Sep 2006 17:27:00 GMT
	(envelope-from mjacob@freebsd.org)
Date: Fri, 8 Sep 2006 17:27:00 GMT
Message-Id: <200609081727.k88HR0OQ006482@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 105848 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: Fri, 08 Sep 2006 17:27:04 -0000

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

Change 105848 by mjacob@newisp on 2006/09/08 17:26:11

	PCI-Express code.

Affected files ...

.. //depot/projects/newisp/dev/mpt/mpt_pci.c#2 edit

Differences ...

==== //depot/projects/newisp/dev/mpt/mpt_pci.c#2 (text+ko) ====

@@ -138,6 +138,10 @@
 #define	PCI_PRODUCT_LSI_FC7X04X		0x0640
 #endif
 
+#ifndef	PCI_PRODUCT_LSI_FC646
+#define	PCI_PRODUCT_LSI_FC646		0x0646
+#endif
+
 #ifndef	PCI_PRODUCT_LSI_1030
 #define	PCI_PRODUCT_LSI_1030		0x0030
 #endif
@@ -228,16 +232,19 @@
 		desc = "LSILogic FC919 FC Adapter";
 		break;
 	case PCI_PRODUCT_LSI_FC929:
-		desc = "LSILogic FC929 FC Adapter";
+		desc = "Dual LSILogic FC929 FC Adapter";
 		break;
 	case PCI_PRODUCT_LSI_FC919X:
-		desc = "LSILogic FC919X FC Adapter";
+		desc = "LSILogic FC919 FC PCI-X Adapter";
 		break;
 	case PCI_PRODUCT_LSI_FC929X:
-		desc = "LSILogic FC929X 2Gb/s FC Adapter";
+		desc = "Dual LSILogic FC929X 2Gb/s FC PCI-X Adapter";
+		break;
+	case PCI_PRODUCT_LSI_FC646:
+		desc = "Dual LSILogic FC7X04X 4Gb/s FC PCI-Express Adapter";
 		break;
 	case PCI_PRODUCT_LSI_FC7X04X:
-		desc = "LSILogic FC7X04X 4Gb/s FC Adapter";
+		desc = "Dual LSILogic FC7X04X 4Gb/s FC PCI-X Adapter";
 		break;
 	case PCI_PRODUCT_LSI_1030:
 		desc = "LSILogic 1030 Ultra4 Adapter";
@@ -250,7 +257,7 @@
 	case PCI_PRODUCT_LSI_SAS1068:
 	case PCI_PRODUCT_LSI_SAS1068E:
 	case PCI_PRODUCT_LSI_SAS1078:
-		desc = "LSILogic SAS Adapter";
+		desc = "LSILogic SAS/SATA Adapter";
 		break;
 	default:
 		return (ENXIO);
@@ -406,6 +413,7 @@
 	case PCI_PRODUCT_LSI_FC919:
 	case PCI_PRODUCT_LSI_FC929:
 	case PCI_PRODUCT_LSI_FC919X:
+	case PCI_PRODUCT_LSI_FC646:
 	case PCI_PRODUCT_LSI_FC7X04X:
 		mpt->is_fc = 1;
 		break;
@@ -463,6 +471,7 @@
 	 * If so, link with our partner (around yet)
 	 */
 	if ((pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_FC929 ||
+	    (pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_FC646 ||
 	    (pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_FC7X04X ||
 	    (pci_get_device(dev) & ~1) == PCI_PRODUCT_LSI_1030) {
 		mpt_link_peer(mpt);