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

util/vgabios: build/warning fixes.

Browse Source 
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
This commit is contained in:
Luc Verhaegen
2009-05-27 11:39:16 +00:00
parent bab4f92c8b
commit e6e899dde9
8 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
util/vgabios/x86emu/include/x86emu/regs.h
View File

@@ -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;

7
util/vgabios/x86emu/src/x86emu/sys.c
View File

@@ -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;
}