summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jacob <mjacob@FreeBSD.org>1999-07-05 20:28:16 +0000
committerMatt Jacob <mjacob@FreeBSD.org>1999-07-05 20:28:16 +0000
commitea2f6b554875e71a158e2327396e87fbbdfa995d (patch)
tree110d1639931cd727bbeab411a31a3db4fd39498e
parent862436726d86497ef4ca96f3384815b14ceeb13a (diff)
Notes
-rw-r--r--sys/pci/isp_pci.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index 430c26850ea0..be20103d2b08 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.13.2.2 1999/06/24 16:45:11 mjacob Exp $ */
+/* $Id: isp_pci.c,v 1.13.2.3 1999/07/03 01:45:17 mjacob Exp $ */
/* release_6_2_99 */
/*
* PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
@@ -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,13 +280,15 @@ 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;