diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-01-20 21:36:39 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-01-20 21:36:39 +0000 |
| commit | 5833f7c0e69df069aec918ba9f34b4a0fe0019f5 (patch) | |
| tree | bf9a13d4e152164f953ad06b5861845a011580b1 /src/devices/emulator/x86emu/sys.c | |
| parent | 20b261dacf56a0bf09a74931cd511537b79b6983 (diff) | |
Backport all x86emu fixes from Pattrick Hueper to coreboot v2 (acked in v2,
hence I consider it trivial in this case). This does not include the Yabel
work.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3880 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices/emulator/x86emu/sys.c')
| -rw-r--r-- | src/devices/emulator/x86emu/sys.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/emulator/x86emu/sys.c b/src/devices/emulator/x86emu/sys.c index 6ff268674a..6f5a3d29c9 100644 --- a/src/devices/emulator/x86emu/sys.c +++ b/src/devices/emulator/x86emu/sys.c @@ -45,7 +45,7 @@ #include <x86emu/regs.h> #include "debug.h" #include "prim_ops.h" -#ifdef COREBOOT_VERSION +#ifdef COREBOOT_VERSION /* Coreboot needs to map printf to printk. */ #include "arch/io.h" #else #include <sys/io.h> @@ -69,7 +69,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(); } if (addr < 0x200) { @@ -405,6 +405,6 @@ void X86EMU_prepareForInt(int num) void X86EMU_setMemBase(void *base, size_t size) { - M.mem_base = (int) base; + M.mem_base = (unsigned long) base; M.mem_size = size; } |