summaryrefslogtreecommitdiffstats
path: root/sys/dev/aha
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>1998-10-12 18:53:33 +0000
committerimp <imp@FreeBSD.org>1998-10-12 18:53:33 +0000
commitffd3a453619917baee500aee74162c34987f6157 (patch)
tree97fe99346e29f3216f03e78eb746a401cab20b55 /sys/dev/aha
parent404d9ee9f6d8a772930f770ba87e520e3805cf98 (diff)
downloadFreeBSD-src-ffd3a453619917baee500aee74162c34987f6157.zip
FreeBSD-src-ffd3a453619917baee500aee74162c34987f6157.tar.gz
Fix breakage introduced by last patch. bde has added CC_QUIET flag to
hasseen_isadev so this will be less noisy when conflicts do exist. Also eliminate redundant warnings about conflicts. Requested by: bde Reviewed by: gibbs
Diffstat (limited to 'sys/dev/aha')
-rw-r--r--sys/dev/aha/aha_isa.c32
1 files changed, 4 insertions, 28 deletions
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index c83ab58..5f81ea1 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: aha_isa.c,v 1.2 1998/09/24 10:43:42 bde Exp $
+ * $Id: aha_isa.c,v 1.3 1998/10/10 00:44:12 imp Exp $
*/
#include <sys/param.h>
@@ -114,16 +114,12 @@ aha_isa_probe: Failing probe.\n",
/*
* Ensure this port has not already been claimed already
- * by a PCI or EISA adapter.
+ * by a PCI, EISA or ISA adapter.
*/
if (aha_check_probed_iop(ioport) != 0)
continue;
-
- /*
- * Make sure that we do not conflict with another device's
- * I/O address.
- */
- if (haveseen_isadev(dev, CC_IOADDR))
+ dev->id_iobase = aha_isa_ports[port_index].addr;
+ if (haveseen_isadev(dev, CC_IOADDR | CC_QUIET))
continue;
/* Allocate a softc for use during probing */
@@ -171,28 +167,8 @@ aha_isa_probe: Failing probe.\n",
"detected for adapter at 0x%x. "
"Failing probe\n", ioport);
}
- dev->id_iobase = aha_isa_ports[port_index].addr;
dev->id_irq = (config_data.irq << 9);
dev->id_intr = aha_isa_intr;
-
- /*
- * OK, check to make sure that we're not stepping on
- * someone else's IRQ or DRQ
- */
- if (haveseen_isadev(dev, CC_DRQ)) {
- printf("aha_isa_probe: Aha card at I/O 0x%x's drq %d "
- "conflicts, ignoring card.\n", dev->id_iobase,
- dev->id_drq);
- aha_free(aha);
- return 0;
- }
- if (haveseen_isadev(dev, CC_IRQ)) {
- printf("aha_isa_probe: Aha card at I/O 0x%x's irq %d "
- "conflicts, ignoring card.\n", dev->id_iobase,
- config_data.irq + 9);
- aha_free(aha);
- return 0;
- }
aha_unit++;
return (AHA_NREGS);
}
OpenPOWER on IntegriCloud