diff options
Diffstat (limited to 'sys/dev/advansys/adv_isa.c')
| -rw-r--r-- | sys/dev/advansys/adv_isa.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c index 37f534e..09fe9f2 100644 --- a/sys/dev/advansys/adv_isa.c +++ b/sys/dev/advansys/adv_isa.c @@ -44,7 +44,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_isa.c,v 1.4 1998/09/15 07:03:39 gibbs Exp $ + * $Id: adv_isa.c,v 1.5 1998/10/10 00:44:12 imp Exp $ */ #include <sys/param.h> @@ -149,11 +149,8 @@ advisaprobe(struct isa_device *id) if (port_addr == 0) /* Already been attached */ continue; - /* - * Make sure that we do not conflict with another device's - * I/O address. - */ - if (haveseen_isadev(id, CC_IOADDR)) + id->id_iobase = port_addr; + if (haveseen_isadev(id, CC_IOADDR | CC_QUIET)) continue; if (adv_find_signature(I386_BUS_SPACE_IO, port_addr)) { @@ -270,18 +267,6 @@ advisaprobe(struct isa_device *id) adv->overrun_physbase = overrun_physbase; - /* - * OK, check to make sure that we're not stepping on - * someone else's IRQ or DRQ - */ - if (haveseen_isadev(id, CC_DRQ)) { - printf("advisaprobe: Aha card at I/O 0x%x's " - "drq %d conflicts, ignoring card.\n", - id->id_iobase, id->id_drq); - adv_free(adv); - return 0; - } - if (adv_init(adv) != 0) { adv_free(adv); return (0); |
