summaryrefslogtreecommitdiffstats
path: root/src/arch/i386/drivers/net/undionly.c
diff options
context:
space:
mode:
authorMichael Brown2007-03-10 19:08:33 +0100
committerMichael Brown2007-03-10 19:08:33 +0100
commit520d9c36af2f9e4f207dd7275a47ea97c668f749 (patch)
treefc665c3d4c250d3c9411219f580f5affbbf03873 /src/arch/i386/drivers/net/undionly.c
parentStart a new release notes file (RELNOTES) in preparation for release (diff)
downloadipxe-520d9c36af2f9e4f207dd7275a47ea97c668f749.tar.gz
ipxe-520d9c36af2f9e4f207dd7275a47ea97c668f749.tar.xz
ipxe-520d9c36af2f9e4f207dd7275a47ea97c668f749.zip
Updated ISAPnP, EISA, MCA and ISA buses to current device model.
ISA 3c509 is currently non-functional, although the EISA (3c509-eisa) and MCA (3c529) variants should build OK. None of this code is yet tested.
Diffstat (limited to 'src/arch/i386/drivers/net/undionly.c')
-rw-r--r--src/arch/i386/drivers/net/undionly.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/arch/i386/drivers/net/undionly.c b/src/arch/i386/drivers/net/undionly.c
index d95584175..ee361493c 100644
--- a/src/arch/i386/drivers/net/undionly.c
+++ b/src/arch/i386/drivers/net/undionly.c
@@ -62,15 +62,12 @@ static int undibus_probe ( struct root_device *rootdev ) {
strncpy ( undi->dev.name, "UNDI",
( sizeof ( undi->dev.name ) - 1 ) );
if ( undi->pci_busdevfn != UNDI_NO_PCI_BUSDEVFN ) {
- struct pci_device_description *pcidesc = &undi->dev.desc.pci;
- pcidesc->bus_type = BUS_TYPE_PCI;
- pcidesc->busdevfn = undi->pci_busdevfn;
- pcidesc->vendor = undi->pci_vendor;
- pcidesc->device = undi->pci_device;
+ undi->dev.desc.bus_type = BUS_TYPE_PCI;
+ undi->dev.desc.location = undi->pci_busdevfn;
+ undi->dev.desc.vendor = undi->pci_vendor;
+ undi->dev.desc.device = undi->pci_device;
} else if ( undi->isapnp_csn != UNDI_NO_ISAPNP_CSN ) {
- struct isapnp_device_description *isapnpdesc
- = &undi->dev.desc.isapnp;
- isapnpdesc->bus_type = BUS_TYPE_ISAPNP;
+ undi->dev.desc.bus_type = BUS_TYPE_ISAPNP;
}
undi->dev.parent = &rootdev->dev;
list_add ( &undi->dev.siblings, &rootdev->dev.children);