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

[karo-tx-uboot.git] / drivers / bios_emulator / bios.c

diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c
index 70e9ce143b41c4f19a9ca010c56995529452cf79..152d70a778c452a697a6ebb83ff9c8d35b746a7e 100644 (file)
--- a/drivers/bios_emulator/bios.c
+++ b/drivers/bios_emulator/bios.c
@@ -3,7 +3,7 @@
 *                        BIOS emulator and interface
 *                      to Realmode X86 Emulator Library
 *
-*  Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+*  Copyright (C) 2007 Freescale Semiconductor, Inc.
 *  Jason Jin <Jason.jin@freescale.com>
 *
 *               Copyright (C) 1996-1999 SciTech Software, Inc.
@@ -36,15 +36,14 @@
 *
 * Description:  Module implementing the BIOS specific functions.
 *
-*              Jason ported this file to u-boot to run the ATI video card
-*              video BIOS.
+*              Jason ported this file to u-boot to run the ATI video card
+*              video BIOS.
 *
 ****************************************************************************/
 
+#define __io
+#include <asm/io.h>
 #include <common.h>
-
-#if defined(CONFIG_BIOSEMU)
-
 #include "biosemui.h"
 
 /*----------------------------- Implementation ----------------------------*/
@@ -85,14 +84,14 @@ static void X86API int42(int intno)
                        PM_outpb(0x3c2, PM_inpb(0x3cc) & (u8) ~ 0x02);
                        return;
                }
-#ifdef  DEBUG
+#ifdef CONFIG_X86EMU_DEBUG
                else {
                        printf("int42: unknown function AH=0x12, BL=0x32, AL=%#02x\n",
                             M.x86.R_AL);
                }
 #endif
        }
-#ifdef  DEBUG
+#ifdef CONFIG_X86EMU_DEBUG
        else {
                printf("int42: unknown function AH=%#02x, AL=%#02x, BL=%#02x\n",
                     M.x86.R_AH, M.x86.R_AL, M.x86.R_BL);
@@ -323,4 +322,3 @@ void _BE_bios_init(u32 * intrTab)
        bios_intr_tab[0x6D] = int10;
        X86EMU_setupIntrFuncs(bios_intr_tab);
 }
-#endif