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/dmfe.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/dmfe.c')
| -rw-r--r-- | src/drivers/net/dmfe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/net/dmfe.c b/src/drivers/net/dmfe.c index 4cfb69bd6..4c8227249 100644 --- a/src/drivers/net/dmfe.c +++ b/src/drivers/net/dmfe.c @@ -457,7 +457,7 @@ static int dmfe_probe ( struct nic *nic, struct pci_device *pci ) { BASE = pci->ioaddr; printf("dmfe.c: Found %s Vendor=0x%hX Device=0x%hX\n", - pci->name, pci->vendor_id, pci->device_id); + pci->name, pci->vendor, pci->device); /* Read Chip revision */ pci_read_config_dword(pci, PCI_REVISION_ID, &dev_rev); @@ -466,7 +466,7 @@ static int dmfe_probe ( struct nic *nic, struct pci_device *pci ) { /* point to private storage */ db = &dfx; - db->chip_id = ((u32) pci->device_id << 16) | pci->vendor_id; + db->chip_id = ((u32) pci->device << 16) | pci->vendor; BASE = pci_bar_start(pci, PCI_BASE_ADDRESS_0); db->chip_revision = dev_rev; @@ -1205,7 +1205,7 @@ static struct nic_operations dmfe_operations = { }; -static struct pci_id dmfe_nics[] = { +static struct pci_device_id dmfe_nics[] = { PCI_ROM(0x1282, 0x9100, "dmfe9100", "Davicom 9100"), PCI_ROM(0x1282, 0x9102, "dmfe9102", "Davicom 9102"), PCI_ROM(0x1282, 0x9009, "dmfe9009", "Davicom 9009"), |