/** @file\r
FrontPage routines to handle the callbacks and browser calls\r
\r
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
\r
BOOLEAN gConnectAllHappened = FALSE;\r
UINTN gCallbackKey;\r
+CHAR8 *mLanguageString;\r
\r
//\r
// Boot video resolution and text mode.\r
OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest\r
)\r
{\r
- CHAR8 *LanguageString;\r
CHAR8 *LangCode;\r
CHAR8 *Lang;\r
UINTN Index;\r
- EFI_STATUS Status;\r
- CHAR8 *PlatformSupportedLanguages;\r
- CHAR8 *BestLanguage;\r
\r
if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) {\r
//\r
break;\r
\r
case FRONT_PAGE_KEY_LANGUAGE:\r
- //\r
- // Collect the languages from what our current Language support is based on our VFR\r
- //\r
- LanguageString = HiiGetSupportedLanguages (gFrontPagePrivate.HiiHandle);\r
- ASSERT (LanguageString != NULL);\r
//\r
// Allocate working buffer for RFC 4646 language in supported LanguageString.\r
//\r
- Lang = AllocatePool (AsciiStrSize (LanguageString));\r
- ASSERT (Lang != NULL);\r
+ Lang = AllocatePool (AsciiStrSize (mLanguageString));\r
+ ASSERT (Lang != NULL); \r
\r
Index = 0;\r
- LangCode = LanguageString;\r
+ LangCode = mLanguageString;\r
while (*LangCode != 0) {\r
GetNextLanguage (&LangCode, Lang);\r
\r
Index++;\r
}\r
\r
- GetEfiGlobalVariable2 (L"PlatformLangCodes", &PlatformSupportedLanguages, NULL);\r
- if (PlatformSupportedLanguages == NULL) {\r
- PlatformSupportedLanguages = AllocateCopyPool (\r
- AsciiStrSize ((CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLangCodes)),\r
- (CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLangCodes)\r
- );\r
- ASSERT (PlatformSupportedLanguages != NULL);\r
- }\r
-\r
- //\r
- // Select the best language in platform supported Language.\r
- //\r
- BestLanguage = GetBestLanguage (\r
- PlatformSupportedLanguages,\r
- FALSE,\r
- Lang,\r
- NULL\r
- );\r
- if (BestLanguage != NULL) {\r
- Status = gRT->SetVariable (\r
+ if (Index == Value->u8) {\r
+ BdsDxeSetVariableAndReportStatusCodeOnError (\r
L"PlatformLang",\r
&gEfiGlobalVariableGuid,\r
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
- AsciiStrSize (BestLanguage),\r
+ AsciiStrSize (Lang),\r
Lang\r
);\r
- ASSERT_EFI_ERROR(Status);\r
- FreePool (BestLanguage);\r
} else {\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
)\r
{\r
EFI_STATUS Status;\r
- CHAR8 *LanguageString;\r
CHAR8 *LangCode;\r
CHAR8 *Lang;\r
CHAR8 *CurrentLang;\r
- CHAR8 *BestLanguage;\r
UINTN OptionCount;\r
CHAR16 *StringBuffer;\r
EFI_HII_HANDLE HiiHandle;\r
VOID *EndOpCodeHandle;\r
EFI_IFR_GUID_LABEL *StartLabel;\r
EFI_IFR_GUID_LABEL *EndLabel;\r
- BOOLEAN FirstFlag;\r
+ EFI_HII_STRING_PROTOCOL *HiiString;\r
+ UINTN StringSize;\r
+\r
+ Lang = NULL;\r
+ StringBuffer = NULL;\r
\r
if (InitializeHiiData) {\r
//\r
// Collect the languages from what our current Language support is based on our VFR\r
//\r
HiiHandle = gFrontPagePrivate.HiiHandle;\r
- LanguageString = HiiGetSupportedLanguages (HiiHandle);\r
- ASSERT (LanguageString != NULL);\r
- //\r
- // Allocate working buffer for RFC 4646 language in supported LanguageString.\r
- //\r
- Lang = AllocatePool (AsciiStrSize (LanguageString));\r
- ASSERT (Lang != NULL);\r
\r
- GetEfiGlobalVariable2 (L"PlatformLang", &CurrentLang, NULL);\r
- //\r
- // Select the best language in LanguageString as the default one.\r
- //\r
- BestLanguage = GetBestLanguage (\r
- LanguageString,\r
- FALSE,\r
- (CurrentLang != NULL) ? CurrentLang : "",\r
- (CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang),\r
- LanguageString,\r
- NULL\r
- );\r
+ CurrentLang = GetEfiGlobalVariable (L"PlatformLang");\r
+\r
//\r
- // BestLanguage must be selected as it is the first language in LanguageString by default\r
+ // Get Support language list from variable.\r
//\r
- ASSERT (BestLanguage != NULL);\r
-\r
- OptionCount = 0;\r
- LangCode = LanguageString;\r
- FirstFlag = FALSE;\r
+ if (mLanguageString == NULL){\r
+ mLanguageString = GetEfiGlobalVariable (L"PlatformLangCodes");\r
+ if (mLanguageString == NULL) {\r
+ mLanguageString = AllocateCopyPool (\r
+ AsciiStrSize ((CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLangCodes)),\r
+ (CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLangCodes)\r
+ );\r
+ ASSERT (mLanguageString != NULL);\r
+ }\r
+ }\r
\r
if (gFrontPagePrivate.LanguageToken == NULL) {\r
+ //\r
+ // Count the language list number.\r
+ // \r
+ LangCode = mLanguageString;\r
+ Lang = AllocatePool (AsciiStrSize (mLanguageString));\r
+ ASSERT (Lang != NULL);\r
+ OptionCount = 0;\r
while (*LangCode != 0) {\r
GetNextLanguage (&LangCode, Lang);\r
OptionCount ++;\r
}\r
- gFrontPagePrivate.LanguageToken = AllocatePool (OptionCount * sizeof (EFI_STRING_ID));\r
+\r
+ //\r
+ // Allocate extra 1 as the end tag.\r
+ //\r
+ gFrontPagePrivate.LanguageToken = AllocateZeroPool ((OptionCount + 1) * sizeof (EFI_STRING_ID));\r
ASSERT (gFrontPagePrivate.LanguageToken != NULL);\r
- FirstFlag = TRUE;\r
- }\r
\r
- OptionCount = 0;\r
- LangCode = LanguageString;\r
- while (*LangCode != 0) {\r
- GetNextLanguage (&LangCode, Lang);\r
+ Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &HiiString);\r
+ ASSERT_EFI_ERROR (Status);\r
\r
- if (FirstFlag) {\r
- StringBuffer = HiiGetString (HiiHandle, PRINTABLE_LANGUAGE_NAME_STRING_ID, Lang);\r
- ASSERT (StringBuffer != NULL);\r
+ LangCode = mLanguageString;\r
+ OptionCount = 0;\r
+ while (*LangCode != 0) {\r
+ GetNextLanguage (&LangCode, Lang);\r
\r
- //\r
- // Save the string Id for each language\r
- //\r
+ StringSize = 0;\r
+ Status = HiiString->GetString (HiiString, Lang, HiiHandle, PRINTABLE_LANGUAGE_NAME_STRING_ID, StringBuffer, &StringSize, NULL);\r
+ if (Status == EFI_BUFFER_TOO_SMALL) {\r
+ StringBuffer = AllocateZeroPool (StringSize);\r
+ ASSERT (StringBuffer != NULL);\r
+ Status = HiiString->GetString (HiiString, Lang, HiiHandle, PRINTABLE_LANGUAGE_NAME_STRING_ID, StringBuffer, &StringSize, NULL);\r
+ ASSERT_EFI_ERROR (Status);\r
+ }\r
+\r
+ if (EFI_ERROR (Status)) {\r
+ StringBuffer = AllocatePool (AsciiStrSize (Lang) * sizeof (CHAR16));\r
+ ASSERT (StringBuffer != NULL);\r
+ AsciiStrToUnicodeStr (Lang, StringBuffer);\r
+ }\r
+\r
+ ASSERT (StringBuffer != NULL);\r
gFrontPagePrivate.LanguageToken[OptionCount] = HiiSetString (HiiHandle, 0, StringBuffer, NULL);\r
FreePool (StringBuffer);\r
+\r
+ OptionCount++;\r
}\r
+ }\r
\r
- if (AsciiStrCmp (Lang, BestLanguage) == 0) {\r
+ ASSERT (gFrontPagePrivate.LanguageToken != NULL);\r
+ LangCode = mLanguageString;\r
+ OptionCount = 0;\r
+ if (Lang == NULL) {\r
+ Lang = AllocatePool (AsciiStrSize (mLanguageString));\r
+ ASSERT (Lang != NULL);\r
+ }\r
+ while (*LangCode != 0) {\r
+ GetNextLanguage (&LangCode, Lang);\r
+\r
+ if (CurrentLang != NULL && AsciiStrCmp (Lang, CurrentLang) == 0) {\r
HiiCreateOneOfOptionOpCode (\r
OptionsOpCodeHandle,\r
gFrontPagePrivate.LanguageToken[OptionCount],\r
if (CurrentLang != NULL) {\r
FreePool (CurrentLang);\r
}\r
- FreePool (BestLanguage);\r
FreePool (Lang);\r
- FreePool (LanguageString);\r
\r
HiiCreateOneOfOpCode (\r
StartOpCodeHandle,\r
if (TimeoutDefault == 0) {\r
return EFI_TIMEOUT;\r
}\r
- \r
+\r
DEBUG ((EFI_D_INFO, "\n\nStart showing progress bar... Press any key to stop it! ...Zzz....\n"));\r
\r
SetMem (&Foreground, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);\r
//\r
// User pressed some key\r
//\r
- Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
- if (EFI_ERROR (Status)) {\r
- return Status;\r
- }\r
+ if (!PcdGetBool (PcdConInConnectOnDemand)) {\r
+ Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
\r
- if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
- //\r
- // User pressed enter, equivalent to select "continue"\r
- //\r
- return EFI_TIMEOUT;\r
+ if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
+ //\r
+ // User pressed enter, equivalent to select "continue"\r
+ //\r
+ return EFI_TIMEOUT;\r
+ }\r
}\r
\r
return EFI_SUCCESS;\r
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *SimpleTextOut;\r
UINTN BootTextColumn;\r
UINTN BootTextRow;\r
- \r
+ UINT64 OsIndication;\r
+ UINTN DataSize;\r
+ EFI_INPUT_KEY Key;\r
+\r
GraphicsOutput = NULL;\r
SimpleTextOut = NULL;\r
\r
if (ConnectAllHappened) {\r
gConnectAllHappened = TRUE;\r
}\r
- \r
+\r
if (!mModeInitialized) {\r
//\r
// After the console is ready, get current video resolution \r
mModeInitialized = TRUE;\r
}\r
\r
- \r
\r
- HotkeyBoot ();\r
- if (TimeoutDefault != 0xffff) {\r
- Status = ShowProgress (TimeoutDefault);\r
- StatusHotkey = HotkeyBoot ();\r
+ //\r
+ // goto FrontPage directly when EFI_OS_INDICATIONS_BOOT_TO_FW_UI is set\r
+ //\r
+ OsIndication = 0;\r
+ DataSize = sizeof(UINT64);\r
+ Status = gRT->GetVariable (\r
+ L"OsIndications",\r
+ &gEfiGlobalVariableGuid,\r
+ NULL,\r
+ &DataSize,\r
+ &OsIndication\r
+ );\r
\r
- if (!FeaturePcdGet(PcdBootlogoOnlyEnable) || !EFI_ERROR(StatusHotkey)){\r
- //\r
- // Ensure screen is clear when switch Console from Graphics mode to Text mode\r
- // Skip it in normal boot \r
- //\r
- gST->ConOut->EnableCursor (gST->ConOut, TRUE);\r
- gST->ConOut->ClearScreen (gST->ConOut);\r
+ //\r
+ // goto FrontPage directly when EFI_OS_INDICATIONS_BOOT_TO_FW_UI is set. Skip HotkeyBoot\r
+ //\r
+ if (!EFI_ERROR(Status) && ((OsIndication & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) != 0)) {\r
+ //\r
+ // Clear EFI_OS_INDICATIONS_BOOT_TO_FW_UI to acknowledge OS\r
+ // \r
+ OsIndication &= ~EFI_OS_INDICATIONS_BOOT_TO_FW_UI;\r
+ Status = gRT->SetVariable (\r
+ L"OsIndications",\r
+ &gEfiGlobalVariableGuid,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ sizeof(UINT64),\r
+ &OsIndication\r
+ );\r
+ //\r
+ // Changing the content without increasing its size with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
+ //\r
+ // Follow generic rule, Call ReadKeyStroke to connect ConIn before enter UI\r
+ //\r
+ if (PcdGetBool (PcdConInConnectOnDemand)) {\r
+ gST->ConIn->ReadKeyStroke(gST->ConIn, &Key);\r
}\r
\r
- if (EFI_ERROR (Status)) {\r
- //\r
- // Timeout or user press enter to continue\r
- //\r
- goto Exit;\r
+ //\r
+ // Ensure screen is clear when switch Console from Graphics mode to Text mode\r
+ //\r
+ gST->ConOut->EnableCursor (gST->ConOut, TRUE);\r
+ gST->ConOut->ClearScreen (gST->ConOut);\r
+\r
+ } else {\r
+\r
+ HotkeyBoot ();\r
+ if (TimeoutDefault != 0xffff) {\r
+ Status = ShowProgress (TimeoutDefault);\r
+ StatusHotkey = HotkeyBoot ();\r
+\r
+ if (!FeaturePcdGet(PcdBootlogoOnlyEnable) || !EFI_ERROR(Status) || !EFI_ERROR(StatusHotkey)){\r
+ //\r
+ // Ensure screen is clear when switch Console from Graphics mode to Text mode\r
+ // Skip it in normal boot \r
+ //\r
+ gST->ConOut->EnableCursor (gST->ConOut, TRUE);\r
+ gST->ConOut->ClearScreen (gST->ConOut);\r
+ }\r
+\r
+ if (EFI_ERROR (Status)) {\r
+ //\r
+ // Timeout or user press enter to continue\r
+ //\r
+ goto Exit;\r
+ }\r
}\r
}\r
\r
\r
} while ((Status == EFI_SUCCESS) && (gCallbackKey != FRONT_PAGE_KEY_CONTINUE));\r
\r
+ if (mLanguageString != NULL) {\r
+ FreePool (mLanguageString);\r
+ mLanguageString = NULL;\r
+ }\r
//\r
//Will leave browser, check any reset required change is applied? if yes, reset system\r
//\r
projects / mirror_edk2.git / blobdiff