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/helper_exec.c | |
| parent | 3acece23621eb27abcce34a212344a12d80de500 (diff) | |
| download | coreboot-850e7d48845ed78bc50f9d0d8caae8132d2ba38d.tar.xz | |
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/helper_exec.c')
| -rw-r--r-- | util/vgabios/helper_exec.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/util/vgabios/helper_exec.c b/util/vgabios/helper_exec.c index 73100d96f3..4d6aae5a7c 100644 --- a/util/vgabios/helper_exec.c +++ b/util/vgabios/helper_exec.c @@ -14,21 +14,13 @@ * in xf86EnableIO(). Otherwise we won't trap * on PIO. */ -#include <x86emu/x86emu.h> -#include "helper_exec.h" -#include "test.h" #include <sys/io.h> #include <sys/time.h> #include <stdio.h> - - -int port_rep_inb(u16 port, u32 base, int d_f, u32 count); -u8 x_inb(u16 port); -u16 x_inw(u16 port); -void x_outb(u16 port, u8 val); -void x_outw(u16 port, u16 val); -u32 x_inl(u16 port); -void x_outl(u16 port, u32 val); +#include <stdtypes.h> +#include <x86emu/x86emu.h> +#include "helper_exec.h" +#include "testbios.h" /* general software interrupt handler */ u32 getIntVect(int num) @@ -59,6 +51,8 @@ int run_bios_int(int num) return 1; } +#if 0 + int port_rep_inb(u16 port, u32 base, int d_f, u32 count) { register int inc = d_f ? -1 : 1; @@ -125,6 +119,8 @@ int port_rep_outl(u16 port, u32 base, int d_f, u32 count) return dst - base; } +#endif + u8 x_inb(u16 port) { u8 val; @@ -175,6 +171,7 @@ void x_outl(u16 port, u32 val) outl(val, port); } +#if 0 u8 Mem_rb(int addr) { return (*current->mem->rb) (current, addr); @@ -204,6 +201,7 @@ void Mem_wl(int addr, u32 val) { (*current->mem->wl) (current, addr, val); } +#endif void getsecs(unsigned long *sec, unsigned long *usec) { |