diff options
| author | Michael Brown | 2007-03-10 19:08:33 +0100 |
|---|---|---|
| committer | Michael Brown | 2007-03-10 19:08:33 +0100 |
| commit | 520d9c36af2f9e4f207dd7275a47ea97c668f749 (patch) | |
| tree | fc665c3d4c250d3c9411219f580f5affbbf03873 /src/drivers/net/eepro.c | |
| parent | Start a new release notes file (RELNOTES) in preparation for release (diff) | |
| download | ipxe-520d9c36af2f9e4f207dd7275a47ea97c668f749.tar.gz ipxe-520d9c36af2f9e4f207dd7275a47ea97c668f749.tar.xz ipxe-520d9c36af2f9e4f207dd7275a47ea97c668f749.zip | |
Updated ISAPnP, EISA, MCA and ISA buses to current device model.
ISA 3c509 is currently non-functional, although the EISA (3c509-eisa) and
MCA (3c529) variants should build OK.
None of this code is yet tested.
Diffstat (limited to 'src/drivers/net/eepro.c')
| -rw-r--r-- | src/drivers/net/eepro.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/drivers/net/eepro.c b/src/drivers/net/eepro.c index 5de3fa07..521c720d 100644 --- a/src/drivers/net/eepro.c +++ b/src/drivers/net/eepro.c @@ -33,7 +33,7 @@ has 34 pins, the top row of 2 are not used. #include "etherboot.h" #include "nic.h" -#include "isa.h" +#include <gpxe/isa.h> #include "timer.h" #include <gpxe/ethernet.h> @@ -557,6 +557,7 @@ static int eepro_probe ( struct nic *nic, struct isa_device *isa ) { unsigned char caddr[ETH_ALEN]; unsigned short saddr[ETH_ALEN/2]; } station_addr; + const char *name; nic->irqno = 0; isa_fill_nic ( nic, isa ); @@ -576,16 +577,16 @@ static int eepro_probe ( struct nic *nic, struct isa_device *isa ) { station_addr.saddr[1] = read_eeprom(nic->ioaddr,3); station_addr.saddr[0] = read_eeprom(nic->ioaddr,4); if (l_eepro) - isa->name = "Intel EtherExpress 10 ISA"; + name = "Intel EtherExpress 10 ISA"; else if (read_eeprom(nic->ioaddr,7) == ee_FX_INT2IRQ) { - isa->name = "Intel EtherExpress Pro/10+ ISA"; + name = "Intel EtherExpress Pro/10+ ISA"; l_eepro = 2; } else if (station_addr.saddr[0] == SA_ADDR1) { - isa->name = "Intel EtherExpress Pro/10 ISA"; + name = "Intel EtherExpress Pro/10 ISA"; l_eepro = 1; } else { l_eepro = 0; - isa->name = "Intel 82595-based LAN card"; + name = "Intel 82595-based LAN card"; } station_addr.saddr[0] = swap16(station_addr.saddr[0]); station_addr.saddr[1] = swap16(station_addr.saddr[1]); @@ -594,7 +595,7 @@ static int eepro_probe ( struct nic *nic, struct isa_device *isa ) { nic->node_addr[i] = station_addr.caddr[i]; } - DBG ( "%s ioaddr %#hX, addr %s", isa->name, nic->ioaddr, eth_ntoa ( nic->node_addr ) ); + DBG ( "%s ioaddr %#hX, addr %s", name, nic->ioaddr, eth_ntoa ( nic->node_addr ) ); mem_start = RCV_LOWER_LIMIT << 8; if ((mem_end & 0x3F) < 3 || (mem_end & 0x3F) > 29) |