sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vgabios: fix compilation after x86emu changes

Browse Source 
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>
This commit is contained in:
Stefan Reinauer
2015-09-28 13:12:04 -07:00
committed by Stefan Reinauer
parent 3acece2362
commit 850e7d4884
14 changed files with 145 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
util/vgabios/int1a.c
View File

@ -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))) {