This patch is from 2009-10-20

[coreboot.git] / util / x86emu / include / x86emu / x86emu.h

diff --git a/util/x86emu/include/x86emu/x86emu.h b/util/x86emu/include/x86emu/x86emu.h
index a4b09e3f18d600e43b53f16878408e0bbb7c987a..493e494927b0cd140658c91e0c6ff71a509ef9f1 100644 (file)
--- a/util/x86emu/include/x86emu/x86emu.h
+++ b/util/x86emu/include/x86emu/x86emu.h
@@ -42,25 +42,15 @@
 #ifndef __X86EMU_X86EMU_H
 #define __X86EMU_X86EMU_H
 
-/* FIXME: redefine printk for the moment */
-#ifdef CONFIG_COREBOOT_V2
+#include <stddef.h>
 #include <console/console.h>
-#undef printk
-#define printk(x...) do_printk(BIOS_DEBUG, x)
-#else
-#define printk printf
-#endif 
-
-#ifdef SCITECH
-#include "scitech.h"
-#define        X86API  _ASMAPI
-#define        X86APIP _ASMAPIP
-typedef int X86EMU_pioAddr;
-#else
+#if CONFIG_X86EMU_DEBUG
+#define DEBUG
+#endif
+
 #include "types.h"
 #define        X86API
 #define        X86APIP *
-#endif
 #include "regs.h"
 
 /*---------------------- Macros and type definitions ----------------------*/
@@ -157,16 +147,16 @@ void      X86EMU_setupPioFuncs(X86EMU_pioFuncs *funcs);
 void   X86EMU_setupIntrFuncs(X86EMU_intrFuncs funcs[]);
 void   X86EMU_prepareForInt(int num);
 
-//void X86EMU_setMemBase(void *base, size_t size);
+void X86EMU_setMemBase(void *base, size_t size);
 
 /* decode.c */
 
 void   X86EMU_exec(void);
 void   X86EMU_halt_sys(void);
 
-#ifdef CONFIG_DEBUG
+#if CONFIG_X86EMU_DEBUG
 #define        HALT_SYS()      \
-       printk("halt_sys: in %s\n", __func__);  \
+       printf("halt_sys: in %s\n", __func__);  \
        X86EMU_halt_sys();
 #else
 #define        HALT_SYS()      X86EMU_halt_sys()