diff options
| author | Michael Brown <mcb30@etherboot.org> | 2005-04-21 19:20:39 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2005-04-21 19:20:39 +0000 |
| commit | 614c39a8a40a32146793bd25906964659d90f95b (patch) | |
| tree | 9acc979cce4658905d1bffd26d03058435c5d4c5 /src/drivers/net/eepro100.c | |
| parent | cfe3a663af0dc133b8f9a1652d0820160889d6ea (diff) | |
| download | ipxe-614c39a8a40a32146793bd25906964659d90f95b.tar.gz | |
Automatically updated with the program
#!/usr/bin/perl -w -pi -0777
use strict;
( my $type ) = /find_(\w+?)_boot_device/ or die "Could not find type\n";
( my $disable ) = /\.disable\s*=\s*(\w+)/ or die "Could not locate disable\n";
s/(${disable}\s*\(\s*struct\s+nic\s+\*nic)(\s*\)\s*\{)(\s*)/${1}, struct ${type}_device \*${type} __unused${2}${3}nic_disable ( nic );${3}/s;
s/(${disable}\s*\(\s*struct\s+nic\s+\*nic)(\s*\)\s*;)/${1}, struct ${type}_device \*${type}${2}/g;
s/^\s*.disable\s*=\s*${disable}\s*,\s*?$//m;
s/(_probe\s*\(\s*)struct\s+dev\s+\*dev/${1}struct nic \*nic/g;
s/^\s*struct\s+nic\s+\*nic\s*=\s*nic_device\s*\(\s*dev\s*\)\s*;\s*?$//m;
s/^(\s*)(nic->(ioaddr|irqno)\s*=\s*${type})/${1}${type}_fill_nic ( nic, ${type} );\n${1}${2}/m;
Diffstat (limited to 'src/drivers/net/eepro100.c')
| -rw-r--r-- | src/drivers/net/eepro100.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c index b5b5f821f..1857a9a15 100644 --- a/src/drivers/net/eepro100.c +++ b/src/drivers/net/eepro100.c @@ -603,8 +603,8 @@ static void eepro100_disable ( struct nic *nic __unused ) { * leaves the 82557 initialized, and ready to recieve packets. */ -static int eepro100_probe ( struct dev *dev, struct pci_device *p ) { - struct nic *nic = nic_device ( dev ); +static int eepro100_probe ( struct nic *nic, struct pci_device *p ) { + unsigned short sum = 0; int i; int read_cmd, ee_size; @@ -796,7 +796,7 @@ static struct nic_operations eepro100_operations = { .poll = eepro100_poll, .transmit = eepro100_transmit, .irq = eepro100_irq, - .disable = eepro100_disable, + }; static struct pci_id eepro100_nics[] = { @@ -837,6 +837,7 @@ PCI_ROM(0x8086, 0x5201, "eepro100-5201", "Intel EtherExpress PRO/100 Intelligent static struct pci_driver eepro100_driver = - PCI_DRIVER ( "EEPRO100", eepro100_nics, PCI_NO_CLASS ); + PCI_DRIVER ( eepro100_nics, PCI_NO_CLASS ); -BOOT_DRIVER ( "EEPRO100", find_pci_boot_device, eepro100_driver, eepro100_probe ); +DRIVER ( "EEPRO100", nic_driver, pci_driver, eepro100_driver, + eepro100_probe, eepro100_disable ); |