IMX: novena: remove CONFIG_I2C_MXC

[u-boot] / drivers / bios_emulator / include / biosemu.h

diff --git a/drivers/bios_emulator/include/biosemu.h b/drivers/bios_emulator/include/biosemu.h
index 13cb3170c186a3fa1b486dcf330194474d44dd15..124d79d80e1c60869f225e8c0308ce374a4f4a80 100644 (file)
--- a/drivers/bios_emulator/include/biosemu.h
+++ b/drivers/bios_emulator/include/biosemu.h
@@ -43,6 +43,8 @@
 #ifndef __BIOSEMU_H
 #define __BIOSEMU_H
 
+#include <bios_emul.h>
+
 #ifdef __KERNEL__
 #include "x86emu.h"
 #else
@@ -55,57 +57,6 @@
 
 #pragma pack(1)
 
-#ifndef __KERNEL__
-/****************************************************************************
-REMARKS:
-Data structure used to describe the details specific to a particular VGA
-controller. This information is used to allow the VGA controller to be
-swapped on the fly within the BIOS emulator.
-
-HEADER:
-biosemu.h
-
-MEMBERS:
-pciInfo         - PCI device information block for the controller
-BIOSImage       - Pointer to a read/write copy of the BIOS image
-BIOSImageLen    - Length of the BIOS image
-LowMem          - Copy of key low memory areas
-****************************************************************************/
-typedef struct {
-       PCIDeviceInfo *pciInfo;
-       void *BIOSImage;
-       ulong BIOSImageLen;
-       uchar LowMem[1536];
-} BE_VGAInfo;
-#else
-/****************************************************************************
-REMARKS:
-Data structure used to describe the details for the BIOS emulator system
-environment as used by the X86 emulator library.
-
-HEADER:
-biosemu.h
-
-MEMBERS:
-vgaInfo         - VGA BIOS information structure
-biosmem_base    - Base of the BIOS image
-biosmem_limit   - Limit of the BIOS image
-busmem_base     - Base of the VGA bus memory
-****************************************************************************/
-typedef struct {
-       int function;
-       int device;
-       int bus;
-       u32 VendorID;
-       u32 DeviceID;
-       pci_dev_t pcidev;
-       void *BIOSImage;
-       u32 BIOSImageLen;
-       u8 LowMem[1536];
-} BE_VGAInfo;
-
-#endif                         /* __KERNEL__ */
-
 #define CRT_C   24             /* 24  CRT Controller Registers             */
 #define ATT_C   21             /* 21  Attribute Controller Registers       */
 #define GRA_C   9              /* 9   Graphics Controller Registers        */
@@ -127,9 +78,9 @@ biosmem_limit   - Limit of the BIOS image
 busmem_base     - Base of the VGA bus memory
 timer           - Timer used to emulate PC timer ports
 timer0          - Latched value for timer 0
-timer0Latched   - True if timer 0 value was just latched
+timer0Latched   - true if timer 0 value was just latched
 timer2          - Current value for timer 2
-emulateVGA      - True to emulate VGA I/O and memory accesses
+emulateVGA      - true to emulate VGA I/O and memory accesses
 ****************************************************************************/
 
 typedef struct {