Enable -Werror for romcc

[coreboot.git] / util / vgabios / testbios.c

diff --git a/util/vgabios/testbios.c b/util/vgabios/testbios.c
index 06f61095161f6ee0976a0246fd036a12b532c423..c12e72187e4289321714f0d30baddf31c0efc037 100644 (file)
--- a/util/vgabios/testbios.c
+++ b/util/vgabios/testbios.c
@@ -10,7 +10,8 @@
 #define die(x) { perror(x); exit(1); }
 #define warn(x) { perror(x);  }
 
-#include <x86emu.h>
+#include <x86emu/x86emu.h>
+#include "helper_exec.h"
 #include "test.h"
 #include "pci-userspace.h"
 
@@ -138,7 +139,6 @@ int main(int argc, char **argv)
        unsigned short initialip = 0, initialcs = 0, devfn = 0;
        X86EMU_intrFuncs intFuncs[256];
        void X86EMU_setMemBase(void *base, size_t size);
-       void X86EMU_setabseg(void *abseg);
        void x86emu_dump_xregs(void);
        int X86EMU_set_debug(int debug);
        int debugflag = 0;
@@ -267,7 +267,7 @@ int main(int argc, char **argv)
                        }
                }
        }
-       
+
        if (absegname) {
                abseg = mapitin(absegname, (off_t) 0xa0000, 0x20000);
                if (!abseg)
@@ -276,7 +276,7 @@ int main(int argc, char **argv)
 
        current = &p;
        X86EMU_setMemBase(biosmem, sizeof(biosmem));
-       X86EMU_setabseg(abseg);
+       M.abseg = (unsigned long)abseg;
        X86EMU_setupPioFuncs(&myfuncs);
        ioperm(0, 0x400, 1);
 
@@ -302,7 +302,7 @@ int main(int argc, char **argv)
        if (devfn) {
                printf("Loading ax with BusDevFn = %x\n",devfn);
        }
-       
+
        current->ax = devfn   ? devfn : 0xff;
        current->dx = 0x80;
        //      current->ip = 0;
@@ -359,7 +359,7 @@ unsigned short get_device(char *arg_val)
        unsigned short devfn=0;
        long bus=0,dev=0,fn=0,need_pack=0;
        char *tok;
-       
+
        tok = strsep(&arg_val,":");
        if (arg_val != NULL) {
                bus = strtol(tok,0,16);
@@ -377,10 +377,10 @@ unsigned short get_device(char *arg_val)
        }
        else {
                if (need_pack ==1 && (strlen(tok))) {
-                       dev = strtol(tok,0,16);                 
+                       dev = strtol(tok,0,16);
                }
        }
-       
+
        if ( need_pack == 1) {
                devfn = bus<<8 | (dev<<3) | fn;
        }