#include "Language.h"\r
#include "Hotkey.h"\r
\r
+BOOLEAN mSetupModeInitialized = FALSE;\r
+UINT32 mSetupTextModeColumn;\r
+UINT32 mSetupTextModeRow;\r
+UINT32 mSetupHorizontalResolution;\r
+UINT32 mSetupVerticalResolution;\r
+\r
BOOLEAN gConnectAllHappened = FALSE;\r
UINTN gCallbackKey;\r
\r
CHAR8 *PlatformSupportedLanguages;\r
CHAR8 *BestLanguage;\r
\r
- if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
+ if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) {\r
+ //\r
+ // All other action return unsupported.\r
+ //\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+ \r
+ gCallbackKey = QuestionId;\r
+\r
+ if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
if ((Value == NULL) || (ActionRequest == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- gCallbackKey = QuestionId;\r
-\r
- //\r
- // The first 4 entries in the Front Page are to be GUARANTEED to remain constant so IHV's can\r
- // describe to their customers in documentation how to find their setup information (namely\r
- // under the device manager and specific buckets)\r
- //\r
switch (QuestionId) {\r
case FRONT_PAGE_KEY_CONTINUE:\r
//\r
// This is the continue - clear the screen and return an error to get out of FrontPage loop\r
//\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
break;\r
\r
case FRONT_PAGE_KEY_LANGUAGE:\r
ASSERT (FALSE);\r
}\r
\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
+\r
FreePool (PlatformSupportedLanguages);\r
FreePool (Lang);\r
FreePool (LanguageString);\r
break;\r
\r
+ default:\r
+ break;\r
+ }\r
+ } else if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
+ if (Value == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
+ //\r
+ // The first 4 entries in the Front Page are to be GUARANTEED to remain constant so IHV's can\r
+ // describe to their customers in documentation how to find their setup information (namely\r
+ // under the device manager and specific buckets)\r
+ //\r
+ switch (QuestionId) {\r
case FRONT_PAGE_KEY_BOOT_MANAGER:\r
//\r
// Boot Manager\r
gCallbackKey = 0;\r
break;\r
}\r
-\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
-\r
- return EFI_SUCCESS;\r
}\r
\r
- //\r
- // All other action return unsupported.\r
- //\r
- return EFI_UNSUPPORTED;\r
+ return EFI_SUCCESS; \r
}\r
\r
/**\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
- SmbiosHandle = 0;\r
+ SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;\r
do {\r
Status = Smbios->GetNext (Smbios, &SmbiosHandle, NULL, &Record, NULL);\r
if (EFI_ERROR(Status)) {\r
UINT32 MaxGopMode;\r
UINT32 MaxTextMode;\r
UINT32 ModeNumber;\r
- UINT32 SetupTextModeColumn;\r
- UINT32 SetupTextModeRow;\r
- UINT32 SetupHorizontalResolution;\r
- UINT32 SetupVerticalResolution;\r
UINTN HandleCount;\r
EFI_HANDLE *HandleBuffer;\r
EFI_STATUS Status;\r
SimpleTextOut = NULL;\r
} \r
\r
- if ((GraphicsOutput == NULL) && (SimpleTextOut == NULL)) {\r
+ if ((GraphicsOutput == NULL) || (SimpleTextOut == NULL)) {\r
return EFI_UNSUPPORTED;\r
}\r
\r
//\r
- // Get user defined text mode for setup.\r
+ // Get user defined text mode for setup only once.\r
// \r
- SetupHorizontalResolution = PcdGet32 (PcdSetupVideoHorizontalResolution);\r
- SetupVerticalResolution = PcdGet32 (PcdSetupVideoVerticalResolution); \r
- SetupTextModeColumn = PcdGet32 (PcdSetupConOutColumn);\r
- SetupTextModeRow = PcdGet32 (PcdSetupConOutRow);\r
+ if (!mSetupModeInitialized) {\r
+ mSetupHorizontalResolution = PcdGet32 (PcdSetupVideoHorizontalResolution);\r
+ mSetupVerticalResolution = PcdGet32 (PcdSetupVideoVerticalResolution); \r
+ mSetupTextModeColumn = PcdGet32 (PcdSetupConOutColumn);\r
+ mSetupTextModeRow = PcdGet32 (PcdSetupConOutRow);\r
+ mSetupModeInitialized = TRUE;\r
+ }\r
\r
MaxGopMode = GraphicsOutput->Mode->MaxMode;\r
MaxTextMode = SimpleTextOut->Mode->MaxMode;\r
&Info\r
);\r
if (!EFI_ERROR (Status)) {\r
- if ((Info->HorizontalResolution == SetupHorizontalResolution) &&\r
- (Info->VerticalResolution == SetupVerticalResolution)) {\r
- if ((GraphicsOutput->Mode->Info->HorizontalResolution == SetupHorizontalResolution) &&\r
- (GraphicsOutput->Mode->Info->VerticalResolution == SetupVerticalResolution)) {\r
+ if ((Info->HorizontalResolution == mSetupHorizontalResolution) &&\r
+ (Info->VerticalResolution == mSetupVerticalResolution)) {\r
+ if ((GraphicsOutput->Mode->Info->HorizontalResolution == mSetupHorizontalResolution) &&\r
+ (GraphicsOutput->Mode->Info->VerticalResolution == mSetupVerticalResolution)) {\r
//\r
// If current video resolution is same with setup video resolution, \r
// then check if current text mode is same with setup text mode.\r
//\r
Status = SimpleTextOut->QueryMode (SimpleTextOut, SimpleTextOut->Mode->Mode, &CurrentColumn, &CurrentRow);\r
ASSERT_EFI_ERROR (Status);\r
- if (CurrentColumn == SetupTextModeColumn && CurrentRow == SetupTextModeRow) {\r
+ if (CurrentColumn == mSetupTextModeColumn && CurrentRow == mSetupTextModeRow) {\r
//\r
// Current text mode is same with setup text mode, text mode need not be change.\r
//\r
for (Index = 0; Index < MaxTextMode; Index++) {\r
Status = SimpleTextOut->QueryMode (SimpleTextOut, Index, &CurrentColumn, &CurrentRow);\r
if (!EFI_ERROR(Status)) {\r
- if ((CurrentColumn == SetupTextModeColumn) && (CurrentRow == SetupTextModeRow)) {\r
+ if ((CurrentColumn == mSetupTextModeColumn) && (CurrentRow == mSetupTextModeRow)) {\r
//\r
// setup text mode is supported, set it.\r
//\r
//\r
// Update text mode PCD.\r
//\r
- PcdSet32 (PcdConOutColumn, SetupTextModeColumn);\r
- PcdSet32 (PcdConOutRow, SetupTextModeRow);\r
+ PcdSet32 (PcdConOutColumn, mSetupTextModeColumn);\r
+ PcdSet32 (PcdConOutRow, mSetupTextModeRow);\r
FreePool (Info);\r
return EFI_SUCCESS;\r
}\r
// Set PCD to restart GraphicsConsole and Consplitter to change video resolution \r
// and produce new text mode based on new resolution.\r
//\r
- PcdSet32 (PcdVideoHorizontalResolution, SetupHorizontalResolution);\r
- PcdSet32 (PcdVideoVerticalResolution, SetupVerticalResolution);\r
- PcdSet32 (PcdConOutColumn, SetupTextModeColumn);\r
- PcdSet32 (PcdConOutRow, SetupTextModeRow);\r
+ PcdSet32 (PcdVideoHorizontalResolution, mSetupHorizontalResolution);\r
+ PcdSet32 (PcdVideoVerticalResolution, mSetupVerticalResolution);\r
+ PcdSet32 (PcdConOutColumn, mSetupTextModeColumn);\r
+ PcdSet32 (PcdConOutRow, mSetupTextModeRow);\r
\r
Status = gBS->LocateHandleBuffer (\r
ByProtocol,\r
BootLogo->SetBootLogo (BootLogo, NULL, 0, 0, 0, 0);\r
}\r
\r
+ Status = EFI_SUCCESS;\r
do {\r
//\r
// Set proper video resolution and text mode for setup\r
UpdateFrontPageStrings ();\r
\r
gCallbackKey = 0;\r
- Status = CallFrontPage ();\r
+ CallFrontPage ();\r
\r
//\r
// If gCallbackKey is greater than 1 and less or equal to 5,\r
projects / mirror_edk2.git / blobdiff