diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2015-09-28 13:12:04 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-10-25 21:33:32 +0100 |
| commit | 850e7d48845ed78bc50f9d0d8caae8132d2ba38d (patch) | |
| tree | 0ae333e7192debc5a8166d0dcd595969546f9a3b /util/vgabios/int1a.c | |
| parent | 3acece23621eb27abcce34a212344a12d80de500 (diff) | |
vgabios: fix compilation after x86emu changes
This utility links in coreboot code, and has been broken for a while
again after removing some hacks from coreboot. I hadn't realized how
bad it was broken last time, and since most of this stuff is still
in a pretty bad shape, I decided to throw all of the changes together.
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Change-Id: If3e4399b1b0e947433b97caa29962ef66ea2993d
Reviewed-on: http://review.coreboot.org/11736
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util/vgabios/int1a.c')
| -rw-r--r-- | util/vgabios/int1a.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/util/vgabios/int1a.c b/util/vgabios/int1a.c index bd9a24c9f8..9fcff8af43 100644 --- a/util/vgabios/int1a.c +++ b/util/vgabios/int1a.c @@ -1,5 +1,6 @@ #include <stdio.h> -#include "test.h" +#include <stdtypes.h> +#include "testbios.h" #include "pci-userspace.h" #define DEBUG_INT1A @@ -8,13 +9,11 @@ #define DEVICE_NOT_FOUND 0x86 #define BAD_REGISTER_NUMBER 0x87 -void x86emu_dump_xregs(void); extern int verbose; - -int int1A_handler() +int int1A_handler(void) { - PCITAG tag; + PCITAG tag = NULL; pciVideoPtr pvp = NULL; if (verbose) { @@ -40,7 +39,7 @@ int int1A_handler() if (X86_DX == pvp->vendor_id && X86_CX == pvp->device_id && X86_ESI == 0) { X86_EAX = X86_AL | (SUCCESSFUL << 8); X86_EFLAGS &= ~((unsigned long) 0x01); /* clear carry flag */ - X86_EBX = pciSlotBX(pvp); + X86_EBX = pciSlotBX(tag); // XXX used to be pvp, but both are NULL } #ifdef SHOW_ALL_DEVICES else if ((pvp = xf86FindPciDeviceVendor(X86_EDX, X86_ECX, X86_ESI, pvp))) { |