PERFORCE change 105848 for review

[Matt Jacob]

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

Change 105848 by mjacob at 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);