diff options
| author | Michael Brown | 2005-04-22 18:09:54 +0200 |
|---|---|---|
| committer | Michael Brown | 2005-04-22 18:09:54 +0200 |
| commit | 49fe02e501cc210e230d207e91bdf6bbd8106421 (patch) | |
| tree | ffc6e1c19f07ed30e983501f77e7d4a0a6ee3bdc /src | |
| parent | Coerced into compiling. (diff) | |
| download | ipxe-49fe02e501cc210e230d207e91bdf6bbd8106421.tar.gz ipxe-49fe02e501cc210e230d207e91bdf6bbd8106421.tar.xz ipxe-49fe02e501cc210e230d207e91bdf6bbd8106421.zip | |
Coerced into compiling
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/net/eepro.c | 8 | ||||
| -rw-r--r-- | src/drivers/net/epic100.c | 4 | ||||
| -rw-r--r-- | src/drivers/net/forcedeth.c | 8 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/drivers/net/eepro.c b/src/drivers/net/eepro.c index ec2c45b4..6b6a7115 100644 --- a/src/drivers/net/eepro.c +++ b/src/drivers/net/eepro.c @@ -567,16 +567,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) - dev->name = "Intel EtherExpress 10 ISA"; + isa->name = "Intel EtherExpress 10 ISA"; else if (read_eeprom(nic->ioaddr,7) == ee_FX_INT2IRQ) { - dev->name = "Intel EtherExpress Pro/10+ ISA"; + isa->name = "Intel EtherExpress Pro/10+ ISA"; l_eepro = 2; } else if (station_addr.saddr[0] == SA_ADDR1) { - dev->name = "Intel EtherExpress Pro/10 ISA"; + isa->name = "Intel EtherExpress Pro/10 ISA"; l_eepro = 1; } else { l_eepro = 0; - dev->name = "Intel 82595-based LAN card"; + isa->name = "Intel 82595-based LAN card"; } station_addr.saddr[0] = swap16(station_addr.saddr[0]); station_addr.saddr[1] = swap16(station_addr.saddr[1]); diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c index ffa2999e..cc236fd6 100644 --- a/src/drivers/net/epic100.c +++ b/src/drivers/net/epic100.c @@ -412,8 +412,8 @@ epic100_poll(struct nic *nic, int retrieve) } - static void -epic100_disable ( struct nic *nic __unused ) { +static void epic100_disable ( struct nic *nic __unused, + struct pci_device *pci __unused ) { /* Soft reset the chip. */ outl(GC_SOFT_RESET, genctl); } diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c index cf2942c6..c9b1040c 100644 --- a/src/drivers/net/forcedeth.c +++ b/src/drivers/net/forcedeth.c @@ -951,11 +951,9 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) { return 0; printf("forcedeth.c: Found %s, vendor=0x%hX, device=0x%hX\n", - dev->name, pci->vendor, pci->dev_id); + pci->name, pci->vendor_id, pci->device_id); - nic->irqno = 0; pci_fill_nic ( nic, pci ); - nic->ioaddr = pci->ioaddr; /* point to private storage */ np = &npx; @@ -1003,12 +1001,12 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) { get_random_bytes(&dev->dev_addr[3], 3); } #endif - printf("%s: MAC Address %!, ", dev->name, nic->node_addr); + printf("%s: MAC Address %!, ", pci->name, nic->node_addr); np->tx_flags = cpu_to_le16(NV_TX_LASTPACKET | NV_TX_LASTPACKET1 | NV_TX_VALID); - switch (pci->dev_id) { + switch (pci->device_id) { case 0x01C3: // nforce np->irqmask = NVREG_IRQMASK_WANTED_2; np->irqmask |= NVREG_IRQ_TIMER; |