summaryrefslogtreecommitdiffstats
path: root/src/drivers/net/pcnet32.c
diff options
context:
space:
mode:
authorMichael Brown2006-05-16 17:12:06 +0200
committerMichael Brown2006-05-16 17:12:06 +0200
commit15ee09ed10d71969abeea9f578f061e096ef43d0 (patch)
treefe9465a87de8f62287474b1c2dc85516b868fbf5 /src/drivers/net/pcnet32.c
parentMissed a reference to heap.h. (diff)
downloadipxe-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/pcnet32.c')
-rw-r--r--src/drivers/net/pcnet32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
index 74fea5a9..51efe39e 100644
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -680,7 +680,7 @@ static int pcnet32_probe ( struct nic *nic, struct pci_device *pci ) {
/* BASE is used throughout to address the card */
ioaddr = pci->ioaddr;
printf("pcnet32.c: Found %s, Vendor=0x%hX Device=0x%hX\n",
- pci->name, pci->vendor_id, pci->device_id);
+ pci->name, pci->vendor, pci->device);
nic->irqno = 0;
pci_fill_nic ( nic, pci );
@@ -1000,7 +1000,7 @@ static struct nic_operations pcnet32_operations = {
};
-static struct pci_id pcnet32_nics[] = {
+static struct pci_device_id pcnet32_nics[] = {
PCI_ROM(0x1022, 0x2000, "pcnet32", "AMD PCnet/PCI"),
PCI_ROM(0x1022, 0x2625, "pcnetfastiii", "AMD PCNet FAST III"),
PCI_ROM(0x1022, 0x2001, "amdhomepna", "AMD PCnet/HomePNA"),