Reapply "OvmfPkg/QemuVideoDxe: Helper functions for unaligned port I/O."

[mirror_edk2.git] / OvmfPkg / QemuVideoDxe / Qemu.h

diff --git a/OvmfPkg/QemuVideoDxe/Qemu.h b/OvmfPkg/QemuVideoDxe/Qemu.h
index 7fbb25b3efd35c47bb88ac31bda9d92653f7f145..d7da761705a12a4d5b65c6bdba5dc787bc09feb0 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Qemu.h
+++ b/OvmfPkg/QemuVideoDxe/Qemu.h
@@ -92,10 +92,10 @@ typedef enum {
   QEMU_VIDEO_CIRRUS_5446,\r
   QEMU_VIDEO_BOCHS,\r
   QEMU_VIDEO_BOCHS_MMIO,\r
-  QEMU_VIDEO_VMWARE_SVGA,\r
 } QEMU_VIDEO_VARIANT;\r
 \r
 typedef struct {\r
+  UINT8                                 SubClass;\r
   UINT16                                VendorId;\r
   UINT16                                DeviceId;\r
   QEMU_VIDEO_VARIANT                    Variant;\r
@@ -116,13 +116,10 @@ typedef struct {
   //\r
   UINTN                                 MaxMode;\r
   QEMU_VIDEO_MODE_DATA                  *ModeData;\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *VmwareSvgaModeInfo;\r
 \r
   QEMU_VIDEO_VARIANT                    Variant;\r
   FRAME_BUFFER_CONFIGURE                *FrameBufferBltConfigure;\r
   UINTN                                 FrameBufferBltConfigureSize;\r
-  UINT8                                 FrameBufferVramBarIndex;\r
-  UINT16                                VmwareSvgaBasePort;\r
 } QEMU_VIDEO_PRIVATE_DATA;\r
 \r
 ///\r
@@ -506,34 +503,9 @@ QemuVideoBochsModeSetup (
   BOOLEAN                  IsQxl\r
   );\r
 \r
-EFI_STATUS\r
-QemuVideoVmwareSvgaModeSetup (\r
-  QEMU_VIDEO_PRIVATE_DATA *Private\r
-  );\r
-\r
 VOID\r
 InstallVbeShim (\r
   IN CONST CHAR16         *CardName,\r
   IN EFI_PHYSICAL_ADDRESS FrameBufferBase\r
   );\r
-\r
-VOID\r
-VmwareSvgaWrite (\r
-  QEMU_VIDEO_PRIVATE_DATA *Private,\r
-  UINT16                  Register,\r
-  UINT32                  Value\r
-  );\r
-\r
-UINT32\r
-VmwareSvgaRead (\r
-  QEMU_VIDEO_PRIVATE_DATA *Private,\r
-  UINT16                  Register\r
-  );\r
-\r
-VOID\r
-InitializeVmwareSvgaGraphicsMode (\r
-  QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  QEMU_VIDEO_BOCHS_MODES   *ModeData\r
-  );\r
-\r
 #endif\r