31c31
< * $Id: aha_isa.c,v 1.3 1998/10/10 00:44:12 imp Exp $
---
> * $Id: aha_isa.c,v 1.4 1998/10/12 18:53:33 imp Exp $
71c71
< int max_port_index;
---
> int max_port_index;
82,83c82
< port_index = 0;
< max_port_index = AHA_NUM_ISAPORTS - 1;
---
>
88,105c87
< if (dev->id_iobase > 0) {
< for (;port_index <= max_port_index; port_index++)
< if (dev->id_iobase >= aha_isa_ports[port_index].addr)
< break;
< if ((port_index > max_port_index)
< || (dev->id_iobase != aha_isa_ports[port_index].addr)) {
< printf("
< aha_isa_probe: Invalid baseport of 0x%x specified.
< aha_isa_probe: Nearest valid baseport is 0x%x.
< aha_isa_probe: Failing probe.\n",
< dev->id_iobase,
< (port_index <= max_port_index)
< ? aha_isa_ports[port_index].addr
< : aha_isa_ports[max_port_index].addr);
< return 0;
< }
< max_port_index = port_index;
< }
---
> aha_find_probe_range(dev->id_iobase, &port_index, &max_port_index);
106a89,91
> if (port_index < 0)
> return 0;
>
113c98
< ioport = aha_isa_ports[port_index].addr;
---
> ioport = aha_iop_from_bio(port_index);
121c106
< dev->id_iobase = aha_isa_ports[port_index].addr;
---
> dev->id_iobase = ioport;
144c129
< error = aha_cmd(aha, BOP_INQUIRE_CONFIG, NULL, /*parmlen*/0,
---
> error = aha_cmd(aha, AOP_INQUIRE_CONFIG, NULL, /*parmlen*/0,
168a154
> return (0);