david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Coerced into compiling

This commit is contained in:
Michael Brown 2005-04-22 16:09:54 +00:00
parent ee88aacdb6
commit 49fe02e501
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers/net/eepro.c
View File

@ -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]);

4
src/drivers/net/epic100.c
View File

@ -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);
}

8
src/drivers/net/forcedeth.c
View File

@ -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;