tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove hard code video resolution in C code and use PCD PcdVideoHorizontalResolution/PcdVideoVerticalResolution for customization. And when PcdConOutRow/PcdConOutColumn and PcdVideoHorizontalResolution/PcdVideoVerticalResolution are all set to 0, the console will be max video resolution and max text mode. 

Signed-off-by: li-elvin
Reviewed-by: niruiyu, hhtian


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12595 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
li-elvin 2011-10-28 08:23:37 +00:00
parent a40af6b043
commit b9b5e3078d
5 changed files with 143 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MdeModulePkg/MdeModulePkg.dec
View File

@ -618,12 +618,22 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxEfiSystemTablePointerAddress|0x0|UINT64|0x30001027
[PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
## This PCD defines the Console output column and the default value is 25 according to UEFI spec
## This PCD defines the Console output column and the default value is 25 according to UEFI spec.
# This PCD could be set to 0 then console output could be at max column and max row.
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|25|UINT32|0x40000006
## This PCD defines the Console output row and the default value is 80 according to UEFI spec
## This PCD defines the Console output row and the default value is 80 according to UEFI spec.
# This PCD could be set to 0 then console output could be at max column and max row.
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|80|UINT32|0x40000007
## This PCD defines the video horizontal resolution.
# This PCD could be set to 0 then video resolution could be at highest resolution.
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800|UINT32|0x40000009
## This PCD defines the video vertical resolution.
# This PCD could be set to 0 then video resolution could be at highest resolution.
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600|UINT32|0x4000000a
[PcdsFixedAtBuild, PcdsDynamic, PcdsDynamicEx]
## Base address of the NV variable range in flash device
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0|UINT32|0x30000001

18
MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
View File

@ -2901,6 +2901,7 @@ ConsplitterSetConsoleOutMode (
UINTN MaxMode;
EFI_STATUS Status;
CONSOLE_OUT_MODE ModeInfo;
CONSOLE_OUT_MODE MaxModeInfo;
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *TextOut;
PreferMode = 0xFF;
@ -2908,6 +2909,8 @@ ConsplitterSetConsoleOutMode (
TextOut = &Private->TextOut;
MaxMode = (UINTN) (TextOut->Mode->MaxMode);
MaxModeInfo.Column = 0;
MaxModeInfo.Row = 0;
ModeInfo.Column = PcdGet32 (PcdConOutColumn);
ModeInfo.Row = PcdGet32 (PcdConOutRow);
@ -2917,9 +2920,24 @@ ConsplitterSetConsoleOutMode (
for (Mode = 0; Mode < MaxMode; Mode++) {
Status = TextOut->QueryMode (TextOut, Mode, &Col, &Row);
if (!EFI_ERROR(Status)) {
if ((ModeInfo.Column != 0) && (ModeInfo.Row != 0)) {
//
// Use user defined column and row
//
if (Col == ModeInfo.Column && Row == ModeInfo.Row) {
PreferMode = Mode;
}
} else {
//
// If user sets PcdConOutColumn or PcdConOutRow to 0,
// find and set the highest text mode.
//
if ((Col >= MaxModeInfo.Column) && (Row >= MaxModeInfo.Row)) {
MaxModeInfo.Column = Col;
MaxModeInfo.Row = Row;
PreferMode = Mode;
}
}
if (Col == 80 && Row == 25) {
BaseMode = Mode;
}

147
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
View File

@ -1,7 +1,7 @@
/** @file
This is the main routine for initializing the Graphics Console support routines.
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -239,13 +239,17 @@ GraphicsConsoleControllerDriverStart (
UINT32 VerticalResolution;
UINT32 ColorDepth;
UINT32 RefreshRate;
UINTN ModeIndex;
UINT32 ModeIndex;
UINTN MaxMode;
UINTN Columns;
UINTN Rows;
UINTN MaxColumns;
UINTN MaxRows;
UINT32 ModeNumber;
EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode;
GRAPHICS_CONSOLE_MODE_DATA *ModeData;
UINTN SizeOfInfo;
EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;
BOOLEAN TextModeFound;
ModeNumber = 0;
//
@ -285,12 +289,8 @@ GraphicsConsoleControllerDriverStart (
goto Error;
}
//
// If the current mode information can not be retrieved, then attempt to set the default mode
// of 800x600, 32 bit color, 60 Hz refresh.
//
HorizontalResolution = 800;
VerticalResolution = 600;
HorizontalResolution = PcdGet32 (PcdVideoHorizontalResolution);
VerticalResolution = PcdGet32 (PcdVideoVerticalResolution);
if (Private->GraphicsOutput != NULL) {
//
@ -298,19 +298,44 @@ GraphicsConsoleControllerDriverStart (
// for the user-defined mode; if there are multiple video devices,
// graphic console driver will set all the video devices to the same mode.
//
if ((HorizontalResolution == 0x0) || (VerticalResolution == 0x0)) {
//
// Find the highest resolution which GOP supports.
//
MaxMode = Private->GraphicsOutput->Mode->MaxMode;
for (ModeIndex = 0; ModeIndex < MaxMode; ModeIndex++) {
Status = Private->GraphicsOutput->QueryMode (
Private->GraphicsOutput,
ModeIndex,
&SizeOfInfo,
&Info
);
if (!EFI_ERROR (Status)) {
if ((Info->HorizontalResolution >= HorizontalResolution) &&
(Info->VerticalResolution >= VerticalResolution)) {
HorizontalResolution = Info->HorizontalResolution;
VerticalResolution = Info->VerticalResolution;
ModeNumber = ModeIndex;
}
FreePool (Info);
}
}
if ((HorizontalResolution == 0x0) || (VerticalResolution == 0x0)) {
Status = EFI_UNSUPPORTED;
goto Error;
}
} else {
//
// Use user-defined resolution
//
Status = CheckModeSupported (
Private->GraphicsOutput,
CURRENT_HORIZONTAL_RESOLUTION,
CURRENT_VERTICAL_RESOLUTION,
HorizontalResolution,
VerticalResolution,
&ModeNumber
);
if (!EFI_ERROR(Status)) {
//
// Update default mode to current mode
//
HorizontalResolution = CURRENT_HORIZONTAL_RESOLUTION;
VerticalResolution = CURRENT_VERTICAL_RESOLUTION;
} else {
if (EFI_ERROR (Status)) {
//
// if not supporting current mode, try 800x600 which is required by UEFI/EFI spec
//
@ -320,11 +345,8 @@ GraphicsConsoleControllerDriverStart (
600,
&ModeNumber
);
}
Mode = Private->GraphicsOutput->Mode;
if (EFI_ERROR (Status) || (Mode->MaxMode != 0)) {
if (EFI_ERROR (Status) && Mode->MaxMode != 0) {
//
// Set default mode failed or device don't support default mode, then get the current mode information
//
@ -332,6 +354,8 @@ GraphicsConsoleControllerDriverStart (
VerticalResolution = Mode->Info->VerticalResolution;
ModeNumber = Mode->Mode;
}
}
}
} else if (FeaturePcdGet (PcdUgaConsumeSupport)) {
//
// At first try to set user-defined resolution
@ -340,22 +364,19 @@ GraphicsConsoleControllerDriverStart (
RefreshRate = 60;
Status = Private->UgaDraw->SetMode (
Private->UgaDraw,
CURRENT_HORIZONTAL_RESOLUTION,
CURRENT_VERTICAL_RESOLUTION,
HorizontalResolution,
VerticalResolution,
ColorDepth,
RefreshRate
);
if (!EFI_ERROR (Status)) {
HorizontalResolution = CURRENT_HORIZONTAL_RESOLUTION;
VerticalResolution = CURRENT_VERTICAL_RESOLUTION;
} else if (FeaturePcdGet (PcdUgaConsumeSupport)) {
if (EFI_ERROR (Status)) {
//
// Try to set 800*600 which is required by UEFI/EFI spec
//
Status = Private->UgaDraw->SetMode (
Private->UgaDraw,
HorizontalResolution,
VerticalResolution,
800,
600,
ColorDepth,
RefreshRate
);
@ -378,50 +399,67 @@ GraphicsConsoleControllerDriverStart (
}
//
// Add Mode #3 that uses the entire display for user-defined mode
// Include the existing pre-defined 80x25, 80x50 and 100x31
// in mGraphicsConsoleDevTemplate.
//
Private->ModeData[3].Columns = HorizontalResolution / EFI_GLYPH_WIDTH;
Private->ModeData[3].Rows = VerticalResolution / EFI_GLYPH_HEIGHT;
//
// Add Mode #4 that uses the PCD values
//
Private->ModeData[4].Columns = (UINTN) PcdGet32 (PcdConOutColumn);
Private->ModeData[4].Rows = (UINTN) PcdGet32 (PcdConOutRow);
MaxMode = 3;
//
// Compute the maximum number of text Rows and Columns that this current graphics mode can support
//
Columns = HorizontalResolution / EFI_GLYPH_WIDTH;
Rows = VerticalResolution / EFI_GLYPH_HEIGHT;
MaxColumns = HorizontalResolution / EFI_GLYPH_WIDTH;
MaxRows = VerticalResolution / EFI_GLYPH_HEIGHT;
//
// Add Mode #3 that uses the entire display for user-defined mode
//
Private->ModeData[MaxMode].Columns = MaxColumns;
Private->ModeData[MaxMode].Rows = MaxRows;
MaxMode++;
//
// Add Mode #4 that uses the PCD values
//
Private->ModeData[MaxMode].Columns = (UINTN) PcdGet32 (PcdConOutColumn);
Private->ModeData[MaxMode].Rows = (UINTN) PcdGet32 (PcdConOutRow);
if ((Private->ModeData[MaxMode].Columns != 0) && (Private->ModeData[MaxMode].Rows != 0)) {
MaxMode++;
}
//
// Here we make sure that mode 0 is valid
//
if (Columns < Private->ModeData[0].Columns ||
Rows < Private->ModeData[0].Rows) {
if (MaxColumns < Private->ModeData[0].Columns ||
MaxRows < Private->ModeData[0].Rows) {
//
// 80x25 cannot be supported.
//
// Fallback to using the PcdConOutColumn and PcdConOutRow
// for mode 0. If the PCDs are also to large, then mode 0
// will be shrunk to fit as needed.
if ((Private->ModeData[4].Columns != 0) && (Private->ModeData[4].Rows != 0)) {
//
Private->ModeData[0].Columns = MIN (Private->ModeData[4].Columns, Columns);
Private->ModeData[0].Rows = MIN (Private->ModeData[4].Rows, Rows);
// Fallback to using the Mode 4 for mode 0 if PcdConOutColumn and PcdConOutRow
// are not 0. If the PCDs are also too large, then mode 0
// will be shrunk to fit as needed. If the PCDs are all 0,
// then mode 0 will be the entire display.
//
Private->ModeData[0].Columns = MIN (Private->ModeData[4].Columns, MaxColumns);
Private->ModeData[0].Rows = MIN (Private->ModeData[4].Rows, MaxRows);
} else {
Private->ModeData[0].Columns = MaxColumns;
Private->ModeData[0].Rows = MaxRows;
}
}
MaxMode = 0;
TextModeFound = FALSE;
for (ModeIndex = 0; ModeIndex < GRAPHICS_MAX_MODE; ModeIndex++) {
ModeData = &Private->ModeData[ModeIndex];
ModeData->GopWidth = HorizontalResolution;
ModeData->GopHeight = VerticalResolution;
ModeData->GopModeNumber = ModeNumber;
if (Columns >= ModeData->Columns &&
Rows >= ModeData->Rows) {
if ((ModeData->Columns != 0) && (ModeData->Rows != 0) &&
(MaxColumns >= ModeData->Columns) && (MaxRows >= ModeData->Rows)) {
ModeData->DeltaX = (HorizontalResolution - (ModeData->Columns * EFI_GLYPH_WIDTH)) >> 1;
ModeData->DeltaY = (VerticalResolution - (ModeData->Rows * EFI_GLYPH_HEIGHT)) >> 1;
MaxMode = ModeIndex + 1;
TextModeFound = TRUE;
} else {
ModeData->Columns = 0;
ModeData->Rows = 0;
@ -433,7 +471,8 @@ GraphicsConsoleControllerDriverStart (
//
// See if the resolution was too small to support any text modes
//
if (MaxMode == 0) {
if (!TextModeFound) {
Status = EFI_UNSUPPORTED;
goto Error;
}

6
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
View File

@ -42,12 +42,6 @@ extern EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding;
extern EFI_NARROW_GLYPH gUsStdNarrowGlyphData[];
extern UINT32 mNarrowFontSize;
//
// User can define valid graphic resolution here
// e.g. 640x480, 800x600, 1024x768...
//
#define CURRENT_HORIZONTAL_RESOLUTION 800
#define CURRENT_VERTICAL_RESOLUTION 600
typedef union {
EFI_NARROW_GLYPH NarrowGlyph;

4
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
View File

@ -4,7 +4,7 @@
#
# This is the main routine for initializing the Graphics Console support routines.
#
# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
@ -67,4 +67,6 @@
[Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution