OvmfPkg/QemuVideoDxe: simplify InitializeBochsGraphicsMode

struct QEMU_VIDEO_MODE_DATA has all the data needed to set the video
mode, there is no need to take the extra indirection and use
struct QEMU_VIDEO_BOCHS_MODES.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c
index d9f0a2464aa3d4f2025b73c787c89accc70ea94f..b91909a14e590b262d520e4383b02820109313a9 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Driver.c
+++ b/OvmfPkg/QemuVideoDxe/Driver.c
@@ -987,14 +987,14 @@ VgaOutb (
 VOID\r
 InitializeBochsGraphicsMode (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  QEMU_VIDEO_BOCHS_MODES   *ModeData\r
+  QEMU_VIDEO_MODE_DATA     *ModeData\r
   )\r
 {\r
   DEBUG ((\r
     DEBUG_INFO,\r
     "InitializeBochsGraphicsMode: %dx%d @ %d\n",\r
-    ModeData->Width,\r
-    ModeData->Height,\r
+    ModeData->HorizontalResolution,\r
+    ModeData->VerticalResolution,\r
     ModeData->ColorDepth\r
     ));\r
 \r
@@ -1007,10 +1007,10 @@ InitializeBochsGraphicsMode (
   BochsWrite (Private, VBE_DISPI_INDEX_Y_OFFSET, 0);\r
 \r
   BochsWrite (Private, VBE_DISPI_INDEX_BPP, (UINT16)ModeData->ColorDepth);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_XRES, (UINT16)ModeData->Width);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_VIRT_WIDTH, (UINT16)ModeData->Width);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_YRES, (UINT16)ModeData->Height);\r
-  BochsWrite (Private, VBE_DISPI_INDEX_VIRT_HEIGHT, (UINT16)ModeData->Height);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_XRES, (UINT16)ModeData->HorizontalResolution);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_VIRT_WIDTH, (UINT16)ModeData->HorizontalResolution);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_YRES, (UINT16)ModeData->VerticalResolution);\r
+  BochsWrite (Private, VBE_DISPI_INDEX_VIRT_HEIGHT, (UINT16)ModeData->VerticalResolution);\r
 \r
   BochsWrite (\r
     Private,\r

diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c
index 5ad0afe883784608e1bcc18c8ce54e191377a528..0c4dea7fb6f2f7f65e42b6d63081acb195c96152 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Gop.c
+++ b/OvmfPkg/QemuVideoDxe/Gop.c
@@ -177,7 +177,7 @@ Routine Description:
       break;\r
     case QEMU_VIDEO_BOCHS_MMIO:\r
     case QEMU_VIDEO_BOCHS:\r
-      InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->InternalModeIndex]);\r
+      InitializeBochsGraphicsMode (Private, ModeData);\r
       break;\r
     default:\r
       ASSERT (FALSE);\r

diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initialize.c
index 533ec661d64f5e54db9fe3af40d7d6936f9f9f15..8a70cf8484836d24aaaf5a9ec6542415a29d6b02 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Initialize.c
+++ b/OvmfPkg/QemuVideoDxe/Initialize.c
@@ -202,7 +202,7 @@ QemuVideoCirrusModeSetup (
 ///\r
 /// Table of supported video modes\r
 ///\r
-QEMU_VIDEO_BOCHS_MODES  QemuVideoBochsModes[] = {\r
+STATIC QEMU_VIDEO_BOCHS_MODES  QemuVideoBochsModes[] = {\r
   { 640,  480,  32 },\r
   { 800,  480,  32 },\r
   { 800,  600,  32 },\r

diff --git a/OvmfPkg/QemuVideoDxe/Qemu.h b/OvmfPkg/QemuVideoDxe/Qemu.h
index 8f05898f862ca4da4400ea76d50102a8f9747e05..fef648c967b2026f85d239ae51ccaf95a2f73259 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Qemu.h
+++ b/OvmfPkg/QemuVideoDxe/Qemu.h
@@ -150,7 +150,6 @@ extern UINT16                        Seq_800_600_256_60[];
 extern UINT8                         Crtc_1024_768_256_60[];\r
 extern UINT16                        Seq_1024_768_256_60[];\r
 extern QEMU_VIDEO_CIRRUS_MODES       QemuVideoCirrusModes[];\r
-extern QEMU_VIDEO_BOCHS_MODES        QemuVideoBochsModes[];\r
 extern EFI_DRIVER_BINDING_PROTOCOL   gQemuVideoDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL   gQemuVideoComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL  gQemuVideoComponentName2;\r
@@ -414,7 +413,7 @@ InitializeCirrusGraphicsMode (
 VOID\r
 InitializeBochsGraphicsMode (\r
   QEMU_VIDEO_PRIVATE_DATA  *Private,\r
-  QEMU_VIDEO_BOCHS_MODES   *ModeData\r
+  QEMU_VIDEO_MODE_DATA     *ModeData\r
   );\r
 \r
 VOID\r