d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add ISP_DISABLE_2200_SUPPORT defines; Add reference to 2200 F/W

Browse Source
This commit is contained in:
mjacob 1999-07-05 20:24:46 +00:00
parent 3bed76dd1e
commit a51d6a587b
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/isp/isp_pci.c
View File

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

22
sys/pci/isp_pci.c
View File

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