diff options
| author | Michael Brown | 2005-04-16 11:30:48 +0200 |
|---|---|---|
| committer | Michael Brown | 2005-04-16 11:30:48 +0200 |
| commit | 9f0237640951470ded761abd092b18062f787954 (patch) | |
| tree | 39808235d1e9b6869db86ef27882eb864b471725 /src/drivers/bus | |
| parent | Improve debug message legibility. (diff) | |
| download | ipxe-9f0237640951470ded761abd092b18062f787954.tar.gz ipxe-9f0237640951470ded761abd092b18062f787954.tar.xz ipxe-9f0237640951470ded761abd092b18062f787954.zip | |
Make isa_probe_addr a simple integer rather than a struct, to facilitate
specification of ISA_PROBE_ADDRS.
Diffstat (limited to 'src/drivers/bus')
| -rw-r--r-- | src/drivers/bus/isa.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c index e2c1e7ae9..a4af12029 100644 --- a/src/drivers/bus/isa.c +++ b/src/drivers/bus/isa.c @@ -13,7 +13,10 @@ * instead. Some cards (e.g. the 3c509) implement a proprietary * ISAPnP-like mechanism. * - * The ISA probe address list can be overridden by config.c; if + * The ISA probe address list can be overridden by config.c; if the + * user specifies ISA_PROBE_ADDRS then that list will be used first. + * (If ISA_PROBE_ADDRS ends with a zero, the driver's own list will + * never be used). */ /* @@ -49,7 +52,7 @@ int find_isa_device ( struct isa_device *isa, struct isa_driver *driver ) { } /* Set I/O address */ - ioaddr = isa_extra_probe_addrs[i].addr; + ioaddr = isa_extra_probe_addrs[i]; /* An I/O address of 0 in extra_probe_addrs list means * stop probing (i.e. don't continue to the @@ -80,7 +83,7 @@ int find_isa_device ( struct isa_device *isa, struct isa_driver *driver ) { } /* Set I/O address */ - ioaddr = driver->probe_addrs[i].addr; + ioaddr = driver->probe_addrs[i]; /* Use probe_addr method to see if there's a device * present at this address. |