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/r8169.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/r8169.c')
| -rw-r--r-- | src/drivers/net/r8169.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c index c11b8271..0efcb35d 100644 --- a/src/drivers/net/r8169.c +++ b/src/drivers/net/r8169.c @@ -868,7 +868,7 @@ static struct nic_operations r8169_operations = { }; -static struct pci_id r8169_nics[] = { +static struct pci_device_id r8169_nics[] = { PCI_ROM(0x10ec, 0x8169, "r8169", "RealTek RTL8169 Gigabit Ethernet"), PCI_ROM(0x16ec, 0x0116, "usr-r8169", "US Robotics RTL8169 Gigabit Ethernet"), PCI_ROM(0x1186, 0x4300, "dlink-r8169", "D-Link RTL8169 Gigabit Ethernet"), @@ -890,7 +890,7 @@ static int r8169_probe ( struct nic *nic, struct pci_device *pci ) { int option = -1, Cap10_100 = 0, Cap1000 = 0; printf("r8169.c: Found %s, Vendor=%hX Device=%hX\n", - pci->name, pci->vendor_id, pci->device_id); + pci->name, pci->vendor, pci->device); board_idx++; |