diff options
| author | Michael Brown <mcb30@etherboot.org> | 2006-05-16 15:12:06 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2006-05-16 15:12:06 +0000 |
| commit | 15ee09ed10d71969abeea9f578f061e096ef43d0 (patch) | |
| tree | fe9465a87de8f62287474b1c2dc85516b868fbf5 /src/drivers/net/w89c840.c | |
| parent | fcdab6299c1d2714164672f3313523d366b033f8 (diff) | |
| download | ipxe-15ee09ed10d71969abeea9f578f061e096ef43d0.tar.gz | |
Restructured PCI subsystem to fit the new device model.
Generic PCI code now handles 64-bit BARs correctly when setting
"membase"; drivers should need to call pci_bar_start() only if they want
to use BARs other than the first memory or I/O BAR.
Split rarely-used PCI functions out into pciextra.c.
Core PCI code is now 662 bytes (down from 1308 bytes in Etherboot 5.4).
284 bytes of this saving comes from the pci/pciextra split.
Cosmetic changes to lots of drivers (e.g. vendor_id->vendor in order to
match the names used in Linux).
Diffstat (limited to 'src/drivers/net/w89c840.c')
| -rw-r--r-- | src/drivers/net/w89c840.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c index 8d8a6ded..97d8d158 100644 --- a/src/drivers/net/w89c840.c +++ b/src/drivers/net/w89c840.c @@ -609,7 +609,7 @@ static struct nic_operations w89c840_operations = { }; -static struct pci_id w89c840_nics[] = { +static struct pci_device_id w89c840_nics[] = { PCI_ROM(0x1050, 0x0840, "winbond840", "Winbond W89C840F"), PCI_ROM(0x11f6, 0x2011, "compexrl100atx", "Compex RL100ATX"), }; @@ -643,20 +643,20 @@ static int w89c840_probe ( struct nic *nic, struct pci_device *p ) { #define PCI_DEVICE_ID_COMPEX_RL100ATX 0x2011 /* From Matt Hortman <mbhortman@acpthinclient.com> */ - if (p->vendor_id == PCI_VENDOR_ID_WINBOND2 - && p->device_id == PCI_DEVICE_ID_WINBOND2_89C840) { + if (p->vendor == PCI_VENDOR_ID_WINBOND2 + && p->device == PCI_DEVICE_ID_WINBOND2_89C840) { /* detected "Winbond W89c840 Fast Ethernet PCI NIC" */ - } else if ( p->vendor_id == PCI_VENDOR_ID_COMPEX - && p->device_id == PCI_DEVICE_ID_COMPEX_RL100ATX) { + } else if ( p->vendor == PCI_VENDOR_ID_COMPEX + && p->device == PCI_DEVICE_ID_COMPEX_RL100ATX) { /* detected "Compex RL100ATX Fast Ethernet PCI NIC" */ } else { /* Gee, guess what? They missed again. */ printf("device ID : %X - is not a Compex RL100ATX NIC.\n", - p->device_id); + p->device); return 0; } |