diff options
| author | Luc Verhaegen <libv@skynet.be> | 2009-05-27 11:39:16 +0000 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2009-05-27 11:39:16 +0000 |
| commit | e6e899dde951823ebc9abf997a6af06debac82a3 (patch) | |
| tree | 348450ad2317cfce4a79595063493a272c240003 /util/vgabios/x86emu | |
| parent | bab4f92c8bdde168ad186c054967e36dc5477d10 (diff) | |
util/vgabios: build/warning fixes.
Signed-off-by: Luc Verhaegen <libv@skynet.be>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4312 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/vgabios/x86emu')
| -rwxr-xr-x | util/vgabios/x86emu/include/x86emu/regs.h | 6 | ||||
| -rw-r--r-- | util/vgabios/x86emu/src/x86emu/sys.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/util/vgabios/x86emu/include/x86emu/regs.h b/util/vgabios/x86emu/include/x86emu/regs.h index 726b7ac6f0..e77c56435b 100755 --- a/util/vgabios/x86emu/include/x86emu/regs.h +++ b/util/vgabios/x86emu/include/x86emu/regs.h @@ -300,9 +300,9 @@ private - private data pointer x86 - X86 registers ****************************************************************************/ typedef struct { - unsigned long mem_base; - unsigned long mem_size; - unsigned long abseg; + void * mem_base; + unsigned int mem_size; + void * abseg; void* private; X86EMU_regs x86; } X86EMU_sysEnv; diff --git a/util/vgabios/x86emu/src/x86emu/sys.c b/util/vgabios/x86emu/src/x86emu/sys.c index ae4c5daba3..695c87a43b 100644 --- a/util/vgabios/x86emu/src/x86emu/sys.c +++ b/util/vgabios/x86emu/src/x86emu/sys.c @@ -50,6 +50,7 @@ #include "xf86_ansic.h" #else #include <string.h> +#include <stdio.h> #endif /*------------------------- Global Variables ------------------------------*/ @@ -186,7 +187,7 @@ u8 *mem_ptr(u32 addr, int size) u8 *retaddr = 0; if (addr > M.mem_size - size) { - DB(printk("mem_ptr: address %#lx out of range!\n", addr); + DB(printk("mem_ptr: address %#x out of range!\n", addr); ) HALT_SYS(); } @@ -596,11 +597,11 @@ void X86EMU_prepareForInt(int num) void X86EMU_setMemBase(void *base, size_t size) { - M.mem_base = (int) base; + M.mem_base = base; M.mem_size = size; } void X86EMU_setabseg(void *abseg) { - M.abseg = (unsigned long) abseg; + M.abseg = abseg; } |