diff options
| author | Michael Brown | 2006-05-16 17:12:06 +0200 |
|---|---|---|
| committer | Michael Brown | 2006-05-16 17:12:06 +0200 |
| commit | 15ee09ed10d71969abeea9f578f061e096ef43d0 (patch) | |
| tree | fe9465a87de8f62287474b1c2dc85516b868fbf5 /src/drivers/net/davicom.c | |
| parent | Missed a reference to heap.h. (diff) | |
| download | ipxe-15ee09ed10d71969abeea9f578f061e096ef43d0.tar.gz ipxe-15ee09ed10d71969abeea9f578f061e096ef43d0.tar.xz ipxe-15ee09ed10d71969abeea9f578f061e096ef43d0.zip | |
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/davicom.c')
| -rw-r--r-- | src/drivers/net/davicom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c index 0f1a78cc..0931d13f 100644 --- a/src/drivers/net/davicom.c +++ b/src/drivers/net/davicom.c @@ -662,8 +662,8 @@ static int davicom_probe ( struct nic *nic, struct pci_device *pci ) { if (pci->ioaddr == 0) return 0; - vendor = pci->vendor_id; - dev_id = pci->device_id; + vendor = pci->vendor; + dev_id = pci->device; ioaddr = pci->ioaddr; pci_fill_nic ( nic, pci ); @@ -703,7 +703,7 @@ static struct nic_operations davicom_operations = { }; -static struct pci_id davicom_nics[] = { +static struct pci_device_id davicom_nics[] = { PCI_ROM(0x1282, 0x9100, "davicom9100", "Davicom 9100"), PCI_ROM(0x1282, 0x9102, "davicom9102", "Davicom 9102"), PCI_ROM(0x1282, 0x9009, "davicom9009", "Davicom 9009"), |