diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-02-28 20:10:20 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-02-28 20:10:20 +0000 |
| commit | 2b34db8d1de2d63ffa829fe03db0ce2aaba40233 (patch) | |
| tree | ba18eb28d25a5e5d28c3b8609b5a292982eed08c /src/devices/emulator | |
| parent | 3c924d2f48ba1bb6a9d5a20453f230bb6be726e0 (diff) | |
coreboot-v2: drop this ugly historic union name in v2 that was dropped in v3
a long time ago. This will make it easier to port v2 boards forward to v3 at
some point (and other things)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3964 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices/emulator')
| -rw-r--r-- | src/devices/emulator/biosemu.c | 2 | ||||
| -rw-r--r-- | src/devices/emulator/pcbios/pcibios.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/emulator/biosemu.c b/src/devices/emulator/biosemu.c index c0584354d2..ebe5fc1df9 100644 --- a/src/devices/emulator/biosemu.c +++ b/src/devices/emulator/biosemu.c @@ -286,7 +286,7 @@ void run_bios(struct device * dev, unsigned long addr) int i; unsigned short initialcs = (addr & 0xF0000) >> 4; unsigned short initialip = (addr + 3) & 0xFFFF; - unsigned short devfn = dev->bus->secondary << 8 | dev->path.u.pci.devfn; + unsigned short devfn = dev->bus->secondary << 8 | dev->path.pci.devfn; X86EMU_intrFuncs intFuncs[256]; X86EMU_setMemBase(0, 0x100000); diff --git a/src/devices/emulator/pcbios/pcibios.c b/src/devices/emulator/pcbios/pcibios.c index 3d645f7359..365eaca02b 100644 --- a/src/devices/emulator/pcbios/pcibios.c +++ b/src/devices/emulator/pcbios/pcibios.c @@ -27,7 +27,7 @@ int pcibios_handler(void) dev = dev_find_device(X86_DX, X86_CX, dev); if (dev != 0) { X86_BH = dev->bus->secondary; - X86_BL = dev->path.u.pci.devfn; + X86_BL = dev->path.pci.devfn; X86_AH = SUCCESSFUL; X86_EFLAGS &= ~FB_CF; /* clear carry flag */ ret = 1; @@ -42,7 +42,7 @@ int pcibios_handler(void) dev = dev_find_class(X86_ECX, dev); if (dev != 0) { X86_BH = dev->bus->secondary; - X86_BL = dev->path.u.pci.devfn; + X86_BL = dev->path.pci.devfn; X86_AH = SUCCESSFUL; X86_EFLAGS &= ~FB_CF; /* clear carry flag */ ret = 1; |