From 9f0237640951470ded761abd092b18062f787954 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 16 Apr 2005 09:30:48 +0000 Subject: Make isa_probe_addr a simple integer rather than a struct, to facilitate specification of ISA_PROBE_ADDRS. --- src/drivers/net/eepro.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/drivers/net/eepro.c') diff --git a/src/drivers/net/eepro.c b/src/drivers/net/eepro.c index d97b2495..a2b75e0e 100644 --- a/src/drivers/net/eepro.c +++ b/src/drivers/net/eepro.c @@ -516,7 +516,7 @@ static int read_eeprom(uint16_t ioaddr, int location) return (retval); } -static int eepro_probe1 ( uint16_t ioaddr ) { +static int eepro_probe1 ( isa_probe_addr_t ioaddr ) { int id, counter; id = inb(ioaddr + ID_REG); @@ -600,10 +600,8 @@ static int eepro_probe ( struct dev *dev, struct isa_device *isa ) { return 1; } -static struct isa_probe_addr eepro_probe_addrs[] = { - { 0x300 }, - { 0x210 }, { 0x240 }, { 0x280 }, { 0x2C0 }, { 0x200 }, - { 0x320 }, { 0x340 }, { 0x360 }, +static isa_probe_addr_t eepro_probe_addrs[] = { + 0x300, 0x210, 0x240, 0x280, 0x2C0, 0x200, 0x320, 0x340, 0x360, }; static struct isa_driver eepro_driver = -- cgit v1.2.3-55-g7522