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/forcedeth.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/forcedeth.c')
| -rw-r--r-- | src/drivers/net/forcedeth.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c index 31a5d675a..cf2942c63 100644 --- a/src/drivers/net/forcedeth.c +++ b/src/drivers/net/forcedeth.c @@ -923,7 +923,7 @@ static struct nic_operations forcedeth_operations = { .poll = forcedeth_poll, .transmit = forcedeth_transmit, .irq = forcedeth_irq, - .disable = forcedeth_disable, + }; static struct pci_id forcedeth_nics[] = { @@ -933,7 +933,7 @@ static struct pci_id forcedeth_nics[] = { }; static struct pci_driver forcedeth_driver = - PCI_DRIVER ( "forcedeth", forcedeth_nics, PCI_NO_CLASS ); + PCI_DRIVER ( forcedeth_nics, PCI_NO_CLASS ); /************************************************************************** PROBE - Look for an adapter, this routine's visible to the outside @@ -941,8 +941,8 @@ PROBE - Look for an adapter, this routine's visible to the outside #define IORESOURCE_MEM 0x00000200 #define board_found 1 #define valid_link 0 -static int forcedeth_probe ( struct dev *dev, struct pci_device *pci ) { - struct nic *nic = nic_device ( dev ); +static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) { + unsigned long addr; int sz; u8 *base; @@ -954,6 +954,7 @@ static int forcedeth_probe ( struct dev *dev, struct pci_device *pci ) { dev->name, pci->vendor, pci->dev_id); nic->irqno = 0; + pci_fill_nic ( nic, pci ); nic->ioaddr = pci->ioaddr; /* point to private storage */ @@ -1035,4 +1036,5 @@ static int forcedeth_probe ( struct dev *dev, struct pci_device *pci ) { /* else */ } -BOOT_DRIVER ( "forcedeth", find_pci_boot_device, forcedeth_driver, forcedeth_probe ); +DRIVER ( "forcedeth", nic_driver, pci_driver, forcedeth_driver, + forcedeth_probe, forcedeth_disable ); |