tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/QemuVideoDxe: simplify InitializeBochsGraphicsMode

Browse Source 
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>
This commit is contained in:
Gerd Hoffmann 2022-01-17 10:58:14 +01:00 committed by mergify[bot]
parent 929804b172
commit 7f25ddbc03
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OvmfPkg/QemuVideoDxe/Driver.c
View File

@ -987,14 +987,14 @@ VgaOutb (
VOID VOID
InitializeBochsGraphicsMode ( InitializeBochsGraphicsMode (
QEMU_VIDEO_PRIVATE_DATA *Private, QEMU_VIDEO_PRIVATE_DATA *Private,
QEMU_VIDEO_BOCHS_MODES *ModeData QEMU_VIDEO_MODE_DATA *ModeData
) )
{ {
DEBUG (( DEBUG ((
DEBUG_INFO, DEBUG_INFO,
"InitializeBochsGraphicsMode: %dx%d @ %d\n", "InitializeBochsGraphicsMode: %dx%d @ %d\n",
ModeData->Width, ModeData->HorizontalResolution,
ModeData->Height, ModeData->VerticalResolution,
ModeData->ColorDepth ModeData->ColorDepth
)); ));
@ -1007,10 +1007,10 @@ InitializeBochsGraphicsMode (
BochsWrite (Private, VBE_DISPI_INDEX_Y_OFFSET, 0); BochsWrite (Private, VBE_DISPI_INDEX_Y_OFFSET, 0);
BochsWrite (Private, VBE_DISPI_INDEX_BPP, (UINT16)ModeData->ColorDepth); BochsWrite (Private, VBE_DISPI_INDEX_BPP, (UINT16)ModeData->ColorDepth);
BochsWrite (Private, VBE_DISPI_INDEX_XRES, (UINT16)ModeData->Width); BochsWrite (Private, VBE_DISPI_INDEX_XRES, (UINT16)ModeData->HorizontalResolution);
BochsWrite (Private, VBE_DISPI_INDEX_VIRT_WIDTH, (UINT16)ModeData->Width); BochsWrite (Private, VBE_DISPI_INDEX_VIRT_WIDTH, (UINT16)ModeData->HorizontalResolution);
BochsWrite (Private, VBE_DISPI_INDEX_YRES, (UINT16)ModeData->Height); BochsWrite (Private, VBE_DISPI_INDEX_YRES, (UINT16)ModeData->VerticalResolution);
BochsWrite (Private, VBE_DISPI_INDEX_VIRT_HEIGHT, (UINT16)ModeData->Height); BochsWrite (Private, VBE_DISPI_INDEX_VIRT_HEIGHT, (UINT16)ModeData->VerticalResolution);
BochsWrite ( BochsWrite (
Private, Private,

2
OvmfPkg/QemuVideoDxe/Gop.c
View File

@ -177,7 +177,7 @@ Routine Description:
break; break;
case QEMU_VIDEO_BOCHS_MMIO: case QEMU_VIDEO_BOCHS_MMIO:
case QEMU_VIDEO_BOCHS: case QEMU_VIDEO_BOCHS:
InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->InternalModeIndex]); InitializeBochsGraphicsMode (Private, ModeData);
break; break;
default: default:
ASSERT (FALSE); ASSERT (FALSE);

2
OvmfPkg/QemuVideoDxe/Initialize.c
View File

@ -202,7 +202,7 @@ QemuVideoCirrusModeSetup (
/// ///
/// Table of supported video modes /// Table of supported video modes
/// ///
QEMU_VIDEO_BOCHS_MODES QemuVideoBochsModes[] = { STATIC QEMU_VIDEO_BOCHS_MODES QemuVideoBochsModes[] = {
{ 640, 480, 32 }, { 640, 480, 32 },
{ 800, 480, 32 }, { 800, 480, 32 },
{ 800, 600, 32 }, { 800, 600, 32 },

3
OvmfPkg/QemuVideoDxe/Qemu.h
View File

@ -150,7 +150,6 @@ extern UINT16 Seq_800_600_256_60[];
extern UINT8 Crtc_1024_768_256_60[]; extern UINT8 Crtc_1024_768_256_60[];
extern UINT16 Seq_1024_768_256_60[]; extern UINT16 Seq_1024_768_256_60[];
extern QEMU_VIDEO_CIRRUS_MODES QemuVideoCirrusModes[]; extern QEMU_VIDEO_CIRRUS_MODES QemuVideoCirrusModes[];
extern QEMU_VIDEO_BOCHS_MODES QemuVideoBochsModes[];
extern EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding; extern EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding;
extern EFI_COMPONENT_NAME_PROTOCOL gQemuVideoComponentName; extern EFI_COMPONENT_NAME_PROTOCOL gQemuVideoComponentName;
extern EFI_COMPONENT_NAME2_PROTOCOL gQemuVideoComponentName2; extern EFI_COMPONENT_NAME2_PROTOCOL gQemuVideoComponentName2;
@ -414,7 +413,7 @@ InitializeCirrusGraphicsMode (
VOID VOID
InitializeBochsGraphicsMode ( InitializeBochsGraphicsMode (
QEMU_VIDEO_PRIVATE_DATA *Private, QEMU_VIDEO_PRIVATE_DATA *Private,
QEMU_VIDEO_BOCHS_MODES *ModeData QEMU_VIDEO_MODE_DATA *ModeData
); );
VOID VOID