Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / drivers / bios_emulator / x86emu / sys.c

diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
index 566389f5862063a51da2e3cd89aa711c13f97033..c2db1213fe66262145e6f790a75aef2012c6ceac 100644 (file)
--- a/drivers/bios_emulator/x86emu/sys.c
+++ b/drivers/bios_emulator/x86emu/sys.c
@@ -35,14 +35,13 @@
 * Description:  This file includes subroutines which are related to
 *               programmed I/O and memory access. Included in this module
 *               are default functions that do nothing. For real uses these
-*               functions will have to be overriden by the user library.
+*               functions will have to be overridden by the user library.
 *
 ****************************************************************************/
 
+#include <common.h>
 #include "x86emu/x86emui.h"
 
-#if defined(CONFIG_BIOSEMU)
-
 /*------------------------- Global Variables ------------------------------*/
 
 X86EMU_sysEnv _X86EMU_env;     /* Global emulator machine state */
@@ -274,6 +273,11 @@ void X86EMU_setupPioFuncs(X86EMU_pioFuncs * funcs)
        sys_outl = funcs->outl;
 }
 
+void X86EMU_setupIntrFunc(int intnum, X86EMU_intrFuncs func)
+{
+       _X86EMU_intrTab[intnum] = func;
+}
+
 /****************************************************************************
 PARAMETERS:
 funcs   - New interrupt vector table to make active
@@ -322,5 +326,3 @@ void X86EMU_prepareForInt(int num)
        M.x86.R_IP = mem_access_word(num * 4);
        M.x86.intr = 0;
 }
-
-#endif