From 5542fe4b1a8b373da7572ba0fd1c363e643ed3d7 Mon Sep 17 00:00:00 2001
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Mon, 5 Jul 1999 20:24:46 +0000
Subject: [PATCH] add ISP_DISABLE_2200_SUPPORT defines; Add reference to 2200
 F/W

---
 sys/dev/isp/isp_pci.c | 22 ++++++++++++++--------
 sys/pci/isp_pci.c     | 22 ++++++++++++++--------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index ba3afb840264..1380d1da31f8 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -1,5 +1,5 @@
-/* $Id: isp_pci.c,v 1.23 1999/06/24 16:42:33 mjacob Exp $ */
-/* release_6_2_99 */
+/* $Id: isp_pci.c,v 1.24 1999/07/02 23:18:03 mjacob Exp $ */
+/* release_6_5_99 */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  * FreeBSD Version.
@@ -121,7 +121,9 @@ static struct ispmdvec mdvec_2100 = {
 	0,			/* Irrelevant to the 2100 */
 	0
 };
+#endif
 
+#ifdef	ISP_DISABLE_2200_SUPPORT
 static struct ispmdvec mdvec_2200 = {
 	isp_pci_rd_reg,
 	isp_pci_wr_reg,
@@ -131,11 +133,11 @@ static struct ispmdvec mdvec_2200 = {
 	NULL,
 	isp_pci_reset1,
 	isp_pci_dumpregs,
-	NULL,
-	0,
+	ISP2200_RISC_CODE,
+	ISP2200_CODE_LENGTH,
 	ISP2100_CODE_ORG,
+	ISP2200_RISC_CODE,
 	0,
-	0,			/* Irrelevant to the 2100 */
 	0
 };
 #endif
@@ -278,12 +280,14 @@ isp_pci_probe(pcici_t tag, pcidi_t type)
 		break;
 #endif
 #ifndef	ISP_DISABLE_2100_SUPPORT
-	case PCI_QLOGIC_ISP2200:
-		x = "Qlogic ISP 2200 PCI FC-AL Adapter";
-		break;
 	case PCI_QLOGIC_ISP2100:
 		x = "Qlogic ISP 2100 PCI FC-AL Adapter";
 		break;
+#endif
+#ifndef	ISP_DISABLE_2200_SUPPORT
+	case PCI_QLOGIC_ISP2200:
+		x = "Qlogic ISP 2200 PCI FC-AL Adapter";
+		break;
 #endif
 	default:
 		return (NULL);
@@ -439,6 +443,8 @@ isp_pci_attach(pcici_t cfid, int unit)
 			linesz = 1;
 		}
 	}
+#endif
+#ifndef	ISP_DISABLE_2200_SUPPORT
 	if (data == PCI_QLOGIC_ISP2200) {
 		mdvp = &mdvec_2200;
 		basetype = ISP_HA_FC_2200;
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index ba3afb840264..1380d1da31f8 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -1,5 +1,5 @@
-/* $Id: isp_pci.c,v 1.23 1999/06/24 16:42:33 mjacob Exp $ */
-/* release_6_2_99 */
+/* $Id: isp_pci.c,v 1.24 1999/07/02 23:18:03 mjacob Exp $ */
+/* release_6_5_99 */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  * FreeBSD Version.
@@ -121,7 +121,9 @@ static struct ispmdvec mdvec_2100 = {
 	0,			/* Irrelevant to the 2100 */
 	0
 };
+#endif
 
+#ifdef	ISP_DISABLE_2200_SUPPORT
 static struct ispmdvec mdvec_2200 = {
 	isp_pci_rd_reg,
 	isp_pci_wr_reg,
@@ -131,11 +133,11 @@ static struct ispmdvec mdvec_2200 = {
 	NULL,
 	isp_pci_reset1,
 	isp_pci_dumpregs,
-	NULL,
-	0,
+	ISP2200_RISC_CODE,
+	ISP2200_CODE_LENGTH,
 	ISP2100_CODE_ORG,
+	ISP2200_RISC_CODE,
 	0,
-	0,			/* Irrelevant to the 2100 */
 	0
 };
 #endif
@@ -278,12 +280,14 @@ isp_pci_probe(pcici_t tag, pcidi_t type)
 		break;
 #endif
 #ifndef	ISP_DISABLE_2100_SUPPORT
-	case PCI_QLOGIC_ISP2200:
-		x = "Qlogic ISP 2200 PCI FC-AL Adapter";
-		break;
 	case PCI_QLOGIC_ISP2100:
 		x = "Qlogic ISP 2100 PCI FC-AL Adapter";
 		break;
+#endif
+#ifndef	ISP_DISABLE_2200_SUPPORT
+	case PCI_QLOGIC_ISP2200:
+		x = "Qlogic ISP 2200 PCI FC-AL Adapter";
+		break;
 #endif
 	default:
 		return (NULL);
@@ -439,6 +443,8 @@ isp_pci_attach(pcici_t cfid, int unit)
 			linesz = 1;
 		}
 	}
+#endif
+#ifndef	ISP_DISABLE_2200_SUPPORT
 	if (data == PCI_QLOGIC_ISP2200) {
 		mdvp = &mdvec_2200;
 		basetype = ISP_HA_FC_2200;