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/tulip.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/tulip.c')
| -rw-r--r-- | src/drivers/net/tulip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c index 7ac02d7b..cebc74cf 100644 --- a/src/drivers/net/tulip.c +++ b/src/drivers/net/tulip.c @@ -1249,8 +1249,8 @@ static int tulip_probe ( struct nic *nic, struct pci_device *pci ) { /* point to private storage */ tp = &tulip_bss.tpx; - tp->vendor_id = pci->vendor_id; - tp->dev_id = pci->device_id; + tp->vendor_id = pci->vendor; + tp->dev_id = pci->device; tp->nic_name = pci->name; tp->if_port = 0; @@ -1275,7 +1275,7 @@ static int tulip_probe ( struct nic *nic, struct pci_device *pci ) { #ifdef TULIP_DEBUG if (tulip_debug > 1) printf ("%s: Looking for Tulip Chip: Vendor=%hX Device=%hX\n", tp->nic_name, - tp->vendor_id, tp->dev_id); + tp->vendor, tp->dev_id); #endif /* Figure out which chip we're dealing with */ @@ -2042,7 +2042,7 @@ static int tulip_check_duplex(struct nic *nic) return 0; } -static struct pci_id tulip_nics[] = { +static struct pci_device_id tulip_nics[] = { PCI_ROM(0x1011, 0x0002, "dc21040", "Digital Tulip"), PCI_ROM(0x1011, 0x0009, "ds21140", "Digital Tulip Fast"), PCI_ROM(0x1011, 0x0014, "dc21041", "Digital Tulip+"), |