summaryrefslogtreecommitdiffstats
path: root/sys/isa
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/isa
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/isa')
-rw-r--r--sys/isa/bt_isa.c31
1 files changed, 4 insertions, 27 deletions
diff --git a/sys/isa/bt_isa.c b/sys/isa/bt_isa.c
index 5473bf2..8009a36 100644
--- a/sys/isa/bt_isa.c
+++ b/sys/isa/bt_isa.c
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: bt_isa.c,v 1.2 1998/09/24 10:43:42 bde Exp $
+ * $Id: bt_isa.c,v 1.3 1998/10/10 00:44:12 imp Exp $
*/
#include <sys/param.h>
@@ -115,16 +115,12 @@ bt_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 (bt_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 = bt_isa_ports[port_index].addr;
+ if (haveseen_isadev(dev, CC_IOADDR | CC_QUIET))
continue;
/* Allocate a softc for use during probing */
@@ -178,28 +174,9 @@ bt_isa_probe: Failing probe.\n",
/* VL DMA */
dev->id_drq = -1;
}
- dev->id_iobase = bt_isa_ports[port_index].addr;
dev->id_irq = (config_data.irq << 9);
dev->id_intr = bt_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("bt_isa_probe: Bt card at I/O 0x%x's drq %d "
- "conflicts, ignoring card.\n", dev->id_iobase,
- dev->id_drq);
- bt_free(bt);
- return 0;
- }
- if (haveseen_isadev(dev, CC_IRQ)) {
- printf("bt_isa_probe: Bt card at I/O 0x%x's irq %d "
- "conflicts, ignoring card.\n", dev->id_iobase,
- config_data.irq + 9);
- bt_free(bt);
- return 0;
- }
bt_unit++;
return (BT_NREGS);
}
OpenPOWER on IntegriCloud