diff options
author | mjacob <mjacob@FreeBSD.org> | 1999-07-06 01:24:20 +0000 |
---|---|---|
committer | mjacob <mjacob@FreeBSD.org> | 1999-07-06 01:24:20 +0000 |
commit | 85059d8401fb4b5884aeabcb41f3119ef495a878 (patch) | |
tree | 2794f1524902c6266ed9b58ee4b3f61b1691381a | |
parent | 88983e2fa584a0ccd018f2290d087e4db4c46350 (diff) | |
download | FreeBSD-src-85059d8401fb4b5884aeabcb41f3119ef495a878.zip FreeBSD-src-85059d8401fb4b5884aeabcb41f3119ef495a878.tar.gz |
add in a boot environment isp_disable flag
-rw-r--r-- | sys/dev/isp/isp_pci.c | 12 | ||||
-rw-r--r-- | sys/pci/isp_pci.c | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 5bab478..69dbd83 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -1,4 +1,4 @@ -/* $Id: isp_pci.c,v 1.26 1999/07/05 22:01:48 mjacob Exp $ */ +/* $Id: isp_pci.c,v 1.27 1999/07/05 22:04:08 mjacob Exp $ */ /* release_6_5_99 */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. @@ -323,6 +323,16 @@ isp_pci_attach(pcici_t cfid, int unit) bzero(pcs, sizeof (struct isp_pcisoftc)); /* + * Figure out if we're supposed to skip this one. + */ + if (getenv_int("isp_disable", &bitmap)) { + if (bitmap & (1 << unit)) { + printf("isp%d: not configuring\n", unit); + return; + } + } + + /* * Figure out which we should try first - memory mapping or i/o mapping? */ #if SCSI_ISP_PREFER_MEM_MAP == 1 diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c index 5bab478..69dbd83 100644 --- a/sys/pci/isp_pci.c +++ b/sys/pci/isp_pci.c @@ -1,4 +1,4 @@ -/* $Id: isp_pci.c,v 1.26 1999/07/05 22:01:48 mjacob Exp $ */ +/* $Id: isp_pci.c,v 1.27 1999/07/05 22:04:08 mjacob Exp $ */ /* release_6_5_99 */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. @@ -323,6 +323,16 @@ isp_pci_attach(pcici_t cfid, int unit) bzero(pcs, sizeof (struct isp_pcisoftc)); /* + * Figure out if we're supposed to skip this one. + */ + if (getenv_int("isp_disable", &bitmap)) { + if (bitmap & (1 << unit)) { + printf("isp%d: not configuring\n", unit); + return; + } + } + + /* * Figure out which we should try first - memory mapping or i/o mapping? */ #if SCSI_ISP_PREFER_MEM_MAP == 1 |