sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IntelFrameworkModulePkg: Clean up source files

Browse Source 
1. Do not use tab characters
2. No trailing white space in one line
3. All files must end with CRLF

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Liming Gao
2018-06-27 21:06:35 +08:00
parent e38f26a2f7
commit 0a6f48249a
246 changed files with 4071 additions and 4071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
View File

@@ -198,15 +198,15 @@ BdsProcessCapsules (
then EFI_INVALID_PARAMETER is returned.
@param VendorGuid A unique identifier for the vendor.
@param Attributes Attributes bitmask to set for the variable.
@param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,
EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or
EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero
causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is
set, then a SetVariable() call with a DataSize of zero will not cause any change to
the variable value (the timestamp associated with the variable may be updated however
even if no new data value is provided,see the description of the
EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not
be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).
@param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,
EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or
EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero
causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is
set, then a SetVariable() call with a DataSize of zero will not cause any change to
the variable value (the timestamp associated with the variable may be updated however
even if no new data value is provided,see the description of the
EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not
be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).
@param Data The contents for the variable.
@retval EFI_SUCCESS The firmware has successfully stored the variable and its data as
@@ -218,8 +218,8 @@ BdsProcessCapsules (
@retval EFI_DEVICE_ERROR The variable could not be retrieved due to a hardware error.
@retval EFI_WRITE_PROTECTED The variable in question is read-only.
@retval EFI_WRITE_PROTECTED The variable in question cannot be deleted.
@retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS
or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo
@retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS
or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo
does NOT pass the validation check carried out by the firmware.
@retval EFI_NOT_FOUND The variable trying to be updated or deleted was not found.

24
IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
View File

@@ -1,28 +1,28 @@
## @file
# BDSDxe module is core driver for BDS phase.
#
# When DxeCore dispatching all DXE driver, this module will produce architecture protocol
# When DxeCore dispatching all DXE driver, this module will produce architecture protocol
# gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry
# interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.
#
# Generally, this module take reposiblity to connect all necessary devices for platform boot,
# Generally, this module take reposiblity to connect all necessary devices for platform boot,
# these boot device path are hold in PlatformBdsLib library instance produced by platform.
# For legacy boot, BDS will transfer control to legacy BIOS after legacy boot device is select.
# For EFI boot, BDS will load boot loader file EFI\BOOT\BOOTIA32.EFI, EFI\BOOT\BOOTX64.EFI,
# For EFI boot, BDS will load boot loader file EFI\BOOT\BOOTIA32.EFI, EFI\BOOT\BOOTX64.EFI,
# EFI\BOOT\BOOTIA64.EFI file from selected boot device and transfer control to boot loader.
#
# BDSDxe also maintain the UI for "Boot Manager, Boot Maintaince Manager, Device Manager" which
# is used for user to configure boot option or maintain hardware device.
#
#
# Copyright (c) 2008 - 2018, 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
# http://opensource.org/licenses/bsd-license.php
#
#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
##
[Defines]
@@ -31,7 +31,7 @@
MODULE_UNI_FILE = BdsDxe.uni
FILE_GUID = FC5C7020-1A48-4198-9BE2-EAD5ABC8CF2F
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
VERSION_STRING = 1.0
ENTRY_POINT = BdsInitialize
#
@@ -91,7 +91,7 @@
MdeModulePkg/MdeModulePkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
[LibraryClasses]
DevicePathLib
BaseLib
@@ -112,7 +112,7 @@
CapsuleLib
PcdLib
UefiHiiServicesLib
[Guids]
## SOMETIMES_PRODUCES ## Variable:L"BootXXXX" # Boot option variable
## SOMETIMES_PRODUCES ## Variable:L"DriverXXXX" # Driver load option.
@@ -170,7 +170,7 @@
gEfiGraphicsOutputProtocolGuid ## SOMETIMES_CONSUMES
## CONSUMES
## NOTIFY
gEfiSimpleTextInputExProtocolGuid
gEfiSimpleTextInputExProtocolGuid
gEfiHiiConfigAccessProtocolGuid ## SOMETIMES_PRODUCES
gEfiFormBrowser2ProtocolGuid ## CONSUMES
gEfiSerialIoProtocolGuid ## SOMETIMES_CONSUMES
@@ -201,7 +201,7 @@
## CONSUMES
## PRODUCES
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution ## PRODUCES
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution ## PRODUCES
@@ -220,7 +220,7 @@
TRUE
#
# [BootMode]
# [BootMode]
# FLASH_UPDATE ## SOMETIMES_CONSUMES # Update Capsule Image
#

8
IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.uni
View File

@@ -4,23 +4,23 @@
// When DxeCore dispatching all DXE driver, this module will produce architecture protocol
// gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will invoke Entry
// interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entered.
//
//
// Generally, this module take reposiblity to connect all necessary devices for platform boot,
// these boot device path are hold in PlatformBdsLib library instance produced by platform.
// For legacy boot, BDS will transfer control to legacy BIOS after legacy boot device is select.
// For EFI boot, BDS will load boot loader file EFI\BOOT\BOOTIA32.EFI, EFI\BOOT\BOOTX64.EFI,
// EFI\BOOT\BOOTIA64.EFI file from selected boot device and transfer control to boot loader.
//
//
// BDSDxe also maintain the UI for "Boot Manager, Boot Maintaince Manager, Device Manager" which
// is used for user to configure boot option or maintain hardware device.
//
// Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
// Copyright (c) 2008 - 2018, 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
// http://opensource.org/licenses/bsd-license.php
//
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//

6
IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxeExtra.uni
View File

@@ -1,7 +1,7 @@
// /** @file
// BdsDxe Localized Strings and Content
//
// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
// Copyright (c) 2013 - 2018, 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
@@ -13,8 +13,8 @@
//
// **/
#string STR_PROPERTIES_MODULE_NAME
#language en-US
#string STR_PROPERTIES_MODULE_NAME
#language en-US
"Boot Device Selection Core DXE Driver"

42
IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
View File

@@ -179,7 +179,7 @@ BdsBootDeviceSelect (
BdsLibBuildOptionFromVar (&BootLists, L"BootOrder");
//
// When we didn't have chance to build boot option variables in the first
// When we didn't have chance to build boot option variables in the first
// full configuration boot (e.g.: Reset in the first page or in Device Manager),
// we have no boot options in the following mini configuration boot.
// Give the last chance to enumerate the boot options.
@@ -260,7 +260,7 @@ BdsBootDeviceSelect (
// Restore to original mode before launching boot option.
//
BdsSetConsoleMode (FALSE);
//
// All the driver options should have been processed since
// now boot will be performed.
@@ -325,10 +325,10 @@ BdsBootDeviceSelect (
/**
Validate input console variable data.
Validate input console variable data.
If found the device path is not a valid device path, remove the variable.
@param VariableName Input console variable name.
**/
@@ -346,7 +346,7 @@ BdsFormalizeConsoleVariable (
&gEfiGlobalVariableGuid,
&VariableSize
);
if ((DevicePath != NULL) && !IsDevicePathValid (DevicePath, VariableSize)) {
if ((DevicePath != NULL) && !IsDevicePathValid (DevicePath, VariableSize)) {
Status = gRT->SetVariable (
VariableName,
&gEfiGlobalVariableGuid,
@@ -363,15 +363,15 @@ BdsFormalizeConsoleVariable (
/**
Formalize Bds global variables.
Formalize Bds global variables.
1. For ConIn/ConOut/ConErr, if found the device path is not a valid device path, remove the variable.
2. For OsIndicationsSupported, Create a BS/RT/UINT64 variable to report caps
2. For OsIndicationsSupported, Create a BS/RT/UINT64 variable to report caps
3. Delete OsIndications variable if it is not NV/BS/RT UINT64
Item 3 is used to solve case when OS corrupts OsIndications. Here simply delete this NV variable.
**/
VOID
VOID
BdsFormalizeEfiGlobalVariable (
VOID
)
@@ -381,7 +381,7 @@ BdsFormalizeEfiGlobalVariable (
UINT64 OsIndication;
UINTN DataSize;
UINT32 Attributes;
//
// Validate Console variable.
//
@@ -604,15 +604,15 @@ BdsEntry (
then EFI_INVALID_PARAMETER is returned.
@param VendorGuid A unique identifier for the vendor.
@param Attributes Attributes bitmask to set for the variable.
@param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,
EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or
EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero
causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is
set, then a SetVariable() call with a DataSize of zero will not cause any change to
the variable value (the timestamp associated with the variable may be updated however
even if no new data value is provided,see the description of the
EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not
be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).
@param DataSize The size in bytes of the Data buffer. Unless the EFI_VARIABLE_APPEND_WRITE,
EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS, or
EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS attribute is set, a size of zero
causes the variable to be deleted. When the EFI_VARIABLE_APPEND_WRITE attribute is
set, then a SetVariable() call with a DataSize of zero will not cause any change to
the variable value (the timestamp associated with the variable may be updated however
even if no new data value is provided,see the description of the
EFI_VARIABLE_AUTHENTICATION_2 descriptor below. In this case the DataSize will not
be zero since the EFI_VARIABLE_AUTHENTICATION_2 descriptor will be populated).
@param Data The contents for the variable.
@retval EFI_SUCCESS The firmware has successfully stored the variable and its data as
@@ -624,8 +624,8 @@ BdsEntry (
@retval EFI_DEVICE_ERROR The variable could not be retrieved due to a hardware error.
@retval EFI_WRITE_PROTECTED The variable in question is read-only.
@retval EFI_WRITE_PROTECTED The variable in question cannot be deleted.
@retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS
or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo
@retval EFI_SECURITY_VIOLATION The variable could not be written due to EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS
or EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACESS being set, but the AuthInfo
does NOT pass the validation check carried out by the firmware.
@retval EFI_NOT_FOUND The variable trying to be updated or deleted was not found.

14
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
View File

@@ -3,7 +3,7 @@
and manage the legacy boot option, all legacy boot option is getting from
the legacy BBS table.
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -53,9 +53,9 @@ OrderLegacyBootOption4SameType (
UINTN BootOrderSize;
UINTN Index;
UINTN StartPosition;
BDS_COMMON_OPTION *BootOption;
CHAR16 OptionName[sizeof ("Boot####")];
UINT16 *BbsIndexArray;
UINT16 *DeviceTypeArray;
@@ -82,12 +82,12 @@ OrderLegacyBootOption4SameType (
ASSERT (*DisBootOption != NULL);
for (Index = 0; Index < BootOrderSize / sizeof (UINT16); Index++) {
UnicodeSPrint (OptionName, sizeof (OptionName), L"Boot%04x", BootOrder[Index]);
InitializeListHead (&List);
BootOption = BdsLibVariableToOption (&List, OptionName);
ASSERT (BootOption != NULL);
if ((DevicePathType (BootOption->DevicePath) == BBS_DEVICE_PATH) &&
(DevicePathSubType (BootOption->DevicePath) == BBS_BBS_DP)) {
//
@@ -119,7 +119,7 @@ OrderLegacyBootOption4SameType (
if (BbsIndexArray[Index] == (DevOrder[DevOrderCount] & 0xFF)) {
StartPosition = MIN (StartPosition, Index);
NewBootOption[DevOrderCount] = BootOrder[Index];
if ((DevOrder[DevOrderCount] & 0xFF00) == 0xFF00) {
(*DisBootOption)[*DisBootOptionCount] = BootOrder[Index];
(*DisBootOptionCount)++;
@@ -157,7 +157,7 @@ OrderLegacyBootOption4SameType (
/**
Group the legacy boot options in the BootOption.
The routine assumes the boot options in the beginning that covers all the device
The routine assumes the boot options in the beginning that covers all the device
types are ordered properly and re-position the following boot options just after
the corresponding boot options with the same device type.
For example:

4
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
View File

@@ -1,7 +1,7 @@
/** @file
declares interface functions
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -39,7 +39,7 @@ BdsBuildLegacyDevNameString (
/**
Group the legacy boot options in the BootOption.
The routine assumes the boot options in the beginning that covers all the device
The routine assumes the boot options in the beginning that covers all the device
types are ordered properly and re-position the following boot options just after
the corresponding boot options with the same device type.
For example:

16
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
View File

@@ -1,16 +1,16 @@
///** @file
//
//
// Boot Maintenance Utility Formset
//
// Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
//
// Copyright (c) 2004 - 2018, 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
// http://opensource.org/licenses/bsd-license.php
//
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
//
//**/
#include "FormGuid.h"
@@ -114,9 +114,9 @@ formset
subtitle text = STRING_TOKEN(STR_NULL_STRING);
//
// We will add "Select Legacy Boot Floppy Drive" and "Select Legacy Boot Hard Drive"
// here dynamically
//
// We will add "Select Legacy Boot Floppy Drive" and "Select Legacy Boot Hard Drive"
// here dynamically
//
label FORM_BOOT_LEGACY_DEVICE_ID;
label LABEL_END;

6
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
View File

@@ -1,7 +1,7 @@
/** @file
Utility routines used by boot maintenance modules.
Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -146,7 +146,7 @@ EfiLibGetVariable (
@param VarName A Null-terminated Unicode string that is
the name of the vendor's variable.
@param VarGuid A unique identifier for the vendor.
@retval EFI_SUCCESS The variable was found and removed
@@ -361,7 +361,7 @@ EfiReallocatePool (
}
/**
Get a string from the Data Hub record based on
Get a string from the Data Hub record based on
a device path.
@param DevPath The device Path.

10
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bmstring.uni
View File

@@ -1,16 +1,16 @@
///** @file
//
//
// String definitions for Boot Maintenance Utility.
//
// Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
//
// Copyright (c) 2004 - 2018, 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
// http://opensource.org/licenses/bsd-license.php
//
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
//
//**/
/=#

102
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
View File

@@ -1,7 +1,7 @@
/** @file
The functions for Boot Maintainence Main menu.
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -43,7 +43,7 @@ HII_VENDOR_DEVICE_PATH mBmmHiiVendorDevicePath = {
{
END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
{
{
(UINT8) (END_DEVICE_PATH_LENGTH),
(UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
}
@@ -65,7 +65,7 @@ HII_VENDOR_DEVICE_PATH mFeHiiVendorDevicePath = {
{
END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
{
{
(UINT8) (END_DEVICE_PATH_LENGTH),
(UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
}
@@ -143,8 +143,8 @@ InitializeBmmConfig (
//
// Initialize data which located in Console Options Menu
//
GetConsoleOutMode (CallbackData);
//
GetConsoleOutMode (CallbackData);
GetConsoleInCheck (CallbackData);
GetConsoleOutCheck (CallbackData);
GetConsoleErrCheck (CallbackData);
@@ -314,7 +314,7 @@ BootMaintExtractConfig (
@param[in] This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.
@param[in] Configuration A null-terminated Unicode string in
<ConfigString> format.
<ConfigString> format.
@param[out] Progress A pointer to a string filled in with the
offset of the most recent '&' before the
first failing name / value pair (or the
@@ -324,7 +324,7 @@ BootMaintExtractConfig (
successful.
@retval EFI_SUCCESS The results have been distributed or are
awaiting distribution.
awaiting distribution.
@retval EFI_OUT_OF_RESOURCES Not enough memory to store the
parts of the results that must be
stored awaiting possible future
@@ -352,9 +352,9 @@ BootMaintRouteConfig (
BM_TERMINAL_CONTEXT *NewTerminalContext;
BM_MENU_ENTRY *NewMenuEntry;
BM_LOAD_CONTEXT *NewLoadContext;
UINT16 Index;
UINT16 Index;
BOOLEAN TerminalAttChange;
BMM_CALLBACK_DATA *Private;
BMM_CALLBACK_DATA *Private;
if (Progress == NULL) {
return EFI_INVALID_PARAMETER;
@@ -374,8 +374,8 @@ BootMaintRouteConfig (
}
Status = gBS->LocateProtocol (
&gEfiHiiConfigRoutingProtocolGuid,
NULL,
&gEfiHiiConfigRoutingProtocolGuid,
NULL,
(VOID**) &ConfigRouting
);
if (EFI_ERROR (Status)) {
@@ -401,7 +401,7 @@ BootMaintRouteConfig (
);
ASSERT_EFI_ERROR (Status);
//
// Compare new and old BMM configuration data and only do action for modified item to
// Compare new and old BMM configuration data and only do action for modified item to
// avoid setting unnecessary non-volatile variable
//
@@ -429,27 +429,27 @@ BootMaintRouteConfig (
}
//
// Change for "delete boot option" page need update NewBmmData->BootOptionOrder, so process
// Change for "delete boot option" page need update NewBmmData->BootOptionOrder, so process
// NewBmmData->BootOptionOrder before NewBmmData->BootOptionDel
//
if (CompareMem (NewBmmData->BootOptionOrder, OldBmmData->BootOptionOrder, sizeof (NewBmmData->BootOptionOrder)) != 0) {
if (CompareMem (NewBmmData->BootOptionOrder, OldBmmData->BootOptionOrder, sizeof (NewBmmData->BootOptionOrder)) != 0) {
Status = Var_UpdateBootOrder (Private);
}
//
// Change for "delete driver option" page need update NewBmmData->DriverOptionOrder, so process
// Change for "delete driver option" page need update NewBmmData->DriverOptionOrder, so process
// NewBmmData->DriverOptionOrder before NewBmmData->DriverOptionDel
//
if (CompareMem (NewBmmData->DriverOptionOrder, OldBmmData->DriverOptionOrder, sizeof (NewBmmData->DriverOptionOrder)) != 0) {
if (CompareMem (NewBmmData->DriverOptionOrder, OldBmmData->DriverOptionOrder, sizeof (NewBmmData->DriverOptionOrder)) != 0) {
Status = Var_UpdateDriverOrder (Private);
}
//
// Check data which located in Boot Options Menu and save the settings if need
//
if (CompareMem (NewBmmData->BootOptionDel, OldBmmData->BootOptionDel, sizeof (NewBmmData->BootOptionDel)) != 0) {
for (Index = 0;
((Index < BootOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->BootOptionDel) / sizeof (NewBmmData->BootOptionDel[0]))));
if (CompareMem (NewBmmData->BootOptionDel, OldBmmData->BootOptionDel, sizeof (NewBmmData->BootOptionDel)) != 0) {
for (Index = 0;
((Index < BootOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->BootOptionDel) / sizeof (NewBmmData->BootOptionDel[0]))));
Index ++) {
NewMenuEntry = BOpt_GetMenuEntry (&BootOptionMenu, Index);
NewLoadContext = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;
@@ -464,9 +464,9 @@ BootMaintRouteConfig (
//
// Check data which located in Driver Options Menu and save the settings if need
//
if (CompareMem (NewBmmData->DriverOptionDel, OldBmmData->DriverOptionDel, sizeof (NewBmmData->DriverOptionDel)) != 0) {
for (Index = 0;
((Index < DriverOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->DriverOptionDel) / sizeof (NewBmmData->DriverOptionDel[0]))));
if (CompareMem (NewBmmData->DriverOptionDel, OldBmmData->DriverOptionDel, sizeof (NewBmmData->DriverOptionDel)) != 0) {
for (Index = 0;
((Index < DriverOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->DriverOptionDel) / sizeof (NewBmmData->DriverOptionDel[0]))));
Index++) {
NewMenuEntry = BOpt_GetMenuEntry (&DriverOptionMenu, Index);
NewLoadContext = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;
@@ -490,14 +490,14 @@ BootMaintRouteConfig (
//
// Bugbug: code not exit in UiApp but in IntelFrameworkModulePkg, need do more check.
//
Private->BmmOldFakeNVData.BootTimeOut = NewBmmData->BootTimeOut;
Private->BmmOldFakeNVData.BootTimeOut = NewBmmData->BootTimeOut;
}
if (CompareMem (&NewBmmData->BootNext, &OldBmmData->BootNext, sizeof (NewBmmData->BootNext)) != 0) {
Status = Var_UpdateBootNext (Private);
}
if (CompareMem (&NewBmmData->ConsoleOutMode, &OldBmmData->ConsoleOutMode, sizeof (NewBmmData->ConsoleOutMode)) != 0) {
if (CompareMem (&NewBmmData->ConsoleOutMode, &OldBmmData->ConsoleOutMode, sizeof (NewBmmData->ConsoleOutMode)) != 0) {
Var_UpdateConMode (Private);
}
@@ -570,7 +570,7 @@ BootMaintRouteConfig (
Var_UpdateConsoleOutOption ();
}
if (CompareMem (NewBmmData->ConsoleErrCheck, OldBmmData->ConsoleErrCheck, sizeof (NewBmmData->ConsoleErrCheck)) != 0) {
if (CompareMem (NewBmmData->ConsoleErrCheck, OldBmmData->ConsoleErrCheck, sizeof (NewBmmData->ConsoleErrCheck)) != 0) {
for (Index = 0; Index < ConsoleErrMenu.MenuNumber; Index++) {
NewMenuEntry = BOpt_GetMenuEntry (&ConsoleErrMenu, Index);
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;
@@ -600,7 +600,7 @@ InitializeLegacyBootOption (
{
RefreshUpdateData ();
mStartLabel->Number = FORM_BOOT_LEGACY_DEVICE_ID;
//
// If LegacyBios Protocol is installed, add 3 tags about legacy boot option
// in BootOption form: legacy FD/HD/CD/NET/BEV
@@ -649,7 +649,7 @@ InitializeLegacyBootOption (
EFI_IFR_FLAG_CALLBACK,
FORM_SET_BEV_ORDER_ID
);
HiiUpdateForm (
mBmmCallbackInfo->BmmHiiHandle,
&gBootMaintFormSetGuid,
@@ -657,7 +657,7 @@ InitializeLegacyBootOption (
mStartOpCodeHandle, // Label FORM_BOOT_LEGACY_DEVICE_ID
mEndOpCodeHandle // LABEL_END
);
return EFI_SUCCESS;
}
@@ -700,7 +700,7 @@ BootMaintCallback (
UINTN Pos;
UINTN Bit;
UINT16 NewValuePos;
UINT16 Index3;
UINT16 Index3;
UINT16 Index2;
UINT16 Index;
UINT8 *OldLegacyDev;
@@ -717,17 +717,17 @@ BootMaintCallback (
if (!EFI_ERROR (Status)) {
InitializeLegacyBootOption ();
}
return EFI_SUCCESS;
}
if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) {
if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) {
//
// All other action return unsupported.
//
return EFI_UNSUPPORTED;
}
Status = EFI_SUCCESS;
OldValue = 0;
NewValue = 0;
@@ -747,7 +747,7 @@ BootMaintCallback (
if (Value == NULL) {
return EFI_INVALID_PARAMETER;
}
UpdatePageId (Private, QuestionId);
if (QuestionId < FILE_OPTION_OFFSET) {
@@ -1021,7 +1021,7 @@ BootMaintCallback (
//
DiscardChangeHandler (Private, CurrentFakeNVMap);
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;
break;
break;
case FORM_RESET:
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
@@ -1121,7 +1121,7 @@ InitializeBM (
UINT8 *Data;
Status = EFI_SUCCESS;
BmmCallbackInfo = mBmmCallbackInfo;
BmmCallbackInfo = mBmmCallbackInfo;
BmmCallbackInfo->BmmPreviousPageId = FORM_MAIN_ID;
BmmCallbackInfo->BmmCurrentPageId = FORM_MAIN_ID;
@@ -1131,17 +1131,17 @@ InitializeBM (
//
// Reinstall String packages to include more new strings.
//
//
// String package size
//
Length = ReadUnaligned32 ((UINT32 *) BdsDxeStrings) - sizeof (UINT32);
//
// Add the length of the Package List Header and the terminating Package Header
// Add the length of the Package List Header and the terminating Package Header
//
Length += sizeof (EFI_HII_PACKAGE_LIST_HEADER) + sizeof (EFI_HII_PACKAGE_HEADER);
//
// Allocate the storage for the entire Package List
//
@@ -1160,12 +1160,12 @@ InitializeBM (
PackageListHeader->PackageLength = Length;
//
// Copy String Data into Package list.
// Copy String Data into Package list.
//
Data = (UINT8 *)(PackageListHeader + 1);
Length = ReadUnaligned32 ((UINT32 *) BdsDxeStrings) - sizeof (UINT32);
CopyMem (Data, (UINT8 *) BdsDxeStrings + sizeof (UINT32), Length);
//
// Add End type HII package.
//
@@ -1178,13 +1178,13 @@ InitializeBM (
//
CopyGuid (&PackageListHeader->PackageListGuid, &gBootMaintFormSetGuid);
Status = gHiiDatabase->UpdatePackageList (gHiiDatabase, BmmCallbackInfo->BmmHiiHandle, PackageListHeader);
//
// Update String package for FE.
//
CopyGuid (&PackageListHeader->PackageListGuid, &gFileExploreFormSetGuid);
Status = gHiiDatabase->UpdatePackageList (gHiiDatabase, BmmCallbackInfo->FeHiiHandle, PackageListHeader);
FreePool (PackageListHeader);
//
@@ -1226,7 +1226,7 @@ InitializeBM (
CreateMenuStringToken (BmmCallbackInfo, BmmCallbackInfo->BmmHiiHandle, &DriverOptionMenu);
CreateMenuStringToken (BmmCallbackInfo, BmmCallbackInfo->BmmHiiHandle, &TerminalMenu);
CreateMenuStringToken (BmmCallbackInfo, BmmCallbackInfo->BmmHiiHandle, &DriverMenu);
InitializeBmmConfig (BmmCallbackInfo);
//
@@ -1238,7 +1238,7 @@ InitializeBM (
// Clean up.
//
CleanUpStringDepository ();
FreeAllMenu ();
Exit:
@@ -1544,7 +1544,7 @@ InitBMPackage (
BMM_CALLBACK_DATA *BmmCallbackInfo;
EFI_STATUS Status;
UINT8 *Ptr;
//
// Create CallbackData structures for Driver Callback
//
@@ -1552,7 +1552,7 @@ InitBMPackage (
if (BmmCallbackInfo == NULL) {
return EFI_OUT_OF_RESOURCES;
}
//
// Create LoadOption in BmmCallbackInfo for Driver Callback
//
@@ -1633,10 +1633,10 @@ InitBMPackage (
NULL
);
ASSERT (BmmCallbackInfo->FeHiiHandle != NULL);
mBmmCallbackInfo = BmmCallbackInfo;
return EFI_SUCCESS;
return EFI_SUCCESS;
}
/**
@@ -1683,8 +1683,8 @@ FreeBMPackage (
FreePool (BmmCallbackInfo->LoadContext);
FreePool (BmmCallbackInfo);
mBmmCallbackInfo = NULL;
mBmmCallbackInfo = NULL;
return;
}

64
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
View File

@@ -1,7 +1,7 @@
/** @file
Header file for boot maintenance module.
Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -473,7 +473,7 @@ BOpt_GetBootOptions (
@return EFI_SUCESS The functin completes successfully.
@retval EFI_OUT_OF_RESOURCES Not enough memory to compete the operation.
**/
EFI_STATUS
@@ -717,11 +717,11 @@ ChangeVariableDevicePath (
/**
Update the multi-instance device path of Terminal Device based on
the global TerminalMenu. If ChangeTernimal is TRUE, the terminal
the global TerminalMenu. If ChangeTernimal is TRUE, the terminal
device path in the Terminal Device in TerminalMenu is also updated.
@param DevicePath The multi-instance device path.
@param ChangeTerminal TRUE, then device path in the Terminal Device
@param ChangeTerminal TRUE, then device path in the Terminal Device
in TerminalMenu is also updated; FALSE, no update.
@return EFI_SUCCESS The function completes successfully.
@@ -737,8 +737,8 @@ ChangeTerminalDevicePath (
// Variable operation by menu selection
//
/**
This function create a currently loaded Boot Option from
the BMM. It then appends this Boot Option to the end of
This function create a currently loaded Boot Option from
the BMM. It then appends this Boot Option to the end of
the "BootOrder" list. It also append this Boot Opotion to the end
of BootOptionMenu.
@@ -760,9 +760,9 @@ Var_UpdateBootOption (
After deleting this boot option, call Var_ChangeBootOrder to
make sure BootOrder is in valid state.
@retval EFI_SUCCESS If all boot load option EFI Variables corresponding to
@retval EFI_SUCCESS If all boot load option EFI Variables corresponding to
BM_LOAD_CONTEXT marked for deletion is deleted
@return Others If failed to update the "BootOrder" variable after deletion.
@return Others If failed to update the "BootOrder" variable after deletion.
**/
EFI_STATUS
@@ -786,8 +786,8 @@ Var_ChangeBootOrder (
);
/**
This function create a currently loaded Drive Option from
the BMM. It then appends this Driver Option to the end of
This function create a currently loaded Drive Option from
the BMM. It then appends this Driver Option to the end of
the "DriverOrder" list. It append this Driver Opotion to the end
of DriverOptionMenu.
@@ -876,7 +876,7 @@ Var_UpdateErrorOutOption (
);
/**
Update the device path of "ConOut", "ConIn" and "ErrOut" based on the new BaudRate, Data Bits,
Update the device path of "ConOut", "ConIn" and "ErrOut" based on the new BaudRate, Data Bits,
parity and stop Bits set.
**/
@@ -886,7 +886,7 @@ Var_UpdateAllConsoleOption (
);
/**
This function update the "BootNext" EFI Variable. If there is no "BootNex" specified in BMM,
This function update the "BootNext" EFI Variable. If there is no "BootNex" specified in BMM,
this EFI Variable is deleted.
It also update the BMM context data specified the "BootNext" value.
@@ -902,7 +902,7 @@ Var_UpdateBootNext (
);
/**
This function update the "BootOrder" EFI Variable based on BMM Formset's NV map. It then refresh
This function update the "BootOrder" EFI Variable based on BMM Formset's NV map. It then refresh
BootOptionMenu with the new "BootOrder" list.
@param CallbackData The BMM context data.
@@ -980,7 +980,7 @@ RefreshUpdateData (
/**
Clean up the dynamic opcode at label and form specified by
both LabelId.
both LabelId.
@param LabelId It is both the Form ID and Label ID for
opcode deletion.
@@ -1177,7 +1177,7 @@ EfiReallocatePool (
@param VarName A Null-terminated Unicode string that is
the name of the vendor's variable.
@param VarGuid A unique identifier for the vendor.
@retval EFI_SUCCESS The variable was found and removed
@@ -1242,7 +1242,7 @@ CreateMenuStringToken (
);
/**
Get a string from the Data Hub record based on
Get a string from the Data Hub record based on
a device path.
@param DevPath The device Path.
@@ -1450,7 +1450,7 @@ FileExplorerCallback (
@param[in] This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.
@param[in] Configuration A null-terminated Unicode string in
<ConfigString> format.
<ConfigString> format.
@param[out] Progress A pointer to a string filled in with the
offset of the most recent '&' before the
first failing name / value pair (or the
@@ -1460,7 +1460,7 @@ FileExplorerCallback (
successful.
@retval EFI_SUCCESS The results have been distributed or are
awaiting distribution.
awaiting distribution.
@retval EFI_OUT_OF_RESOURCES Not enough memory to store the
parts of the results that must be
stored awaiting possible future
@@ -1513,12 +1513,12 @@ EfiLibGetVariable (
);
/**
Get option number according to Boot#### and BootOrder variable.
Get option number according to Boot#### and BootOrder variable.
The value is saved as #### + 1.
@param CallbackData The BMM context data.
**/
VOID
VOID
GetBootOrder (
IN BMM_CALLBACK_DATA *CallbackData
);
@@ -1527,9 +1527,9 @@ GetBootOrder (
Get driver option order from globalc DriverOptionMenu.
@param CallbackData The BMM context data.
**/
VOID
VOID
GetDriverOrder (
IN BMM_CALLBACK_DATA *CallbackData
);
@@ -1562,7 +1562,7 @@ VOID
GetLegacyDeviceOrder (
IN BMM_CALLBACK_DATA *CallbackData
);
/**
Initialize console input device check box to ConsoleInCheck[MAX_MENU_NUMBER]
@@ -1570,12 +1570,12 @@ GetLegacyDeviceOrder (
@param CallbackData The BMM context data.
**/
VOID
**/
VOID
GetConsoleInCheck (
IN BMM_CALLBACK_DATA *CallbackData
);
/**
Initialize console output device check box to ConsoleOutCheck[MAX_MENU_NUMBER]
@@ -1583,8 +1583,8 @@ GetConsoleInCheck (
@param CallbackData The BMM context data.
**/
VOID
**/
VOID
GetConsoleOutCheck (
IN BMM_CALLBACK_DATA *CallbackData
);
@@ -1596,8 +1596,8 @@ GetConsoleOutCheck (
@param CallbackData The BMM context data.
**/
VOID
**/
VOID
GetConsoleErrCheck (
IN BMM_CALLBACK_DATA *CallbackData
);
@@ -1609,8 +1609,8 @@ GetConsoleErrCheck (
@param CallbackData The BMM context data.
**/
VOID
**/
VOID
GetTerminalAttribute (
IN BMM_CALLBACK_DATA *CallbackData
);

50
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
View File

@@ -5,7 +5,7 @@
Boot option manipulation
Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -872,7 +872,7 @@ BOpt_GetBootOptions (
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
UINTN MenuCount;
UINT8 *Ptr;
MenuCount = 0;
BootOrderListSize = 0;
BootNextSize = 0;
@@ -893,7 +893,7 @@ BOpt_GetBootOptions (
if (BootOrderList == NULL) {
return EFI_NOT_FOUND;
}
//
// Get the BootNext from the Var
//
@@ -1007,7 +1007,7 @@ BOpt_GetBootOptions (
NewLoadContext->FilePathListLength = *(UINT16 *) LoadOptionPtr;
LoadOptionPtr += sizeof (UINT16);
StringSize = StrSize((UINT16*)LoadOptionPtr);
NewLoadContext->Description = AllocateCopyPool (StrSize((UINT16*)LoadOptionPtr), LoadOptionPtr);
@@ -1099,7 +1099,7 @@ BOpt_AppendFileName (
Str = AllocateZeroPool (MaxLen * sizeof (CHAR16));
ASSERT (Str != NULL);
TmpStr = AllocateZeroPool (MaxLen * sizeof (CHAR16));
TmpStr = AllocateZeroPool (MaxLen * sizeof (CHAR16));
ASSERT (TmpStr != NULL);
StrCatS (Str, MaxLen, Str1);
@@ -1120,7 +1120,7 @@ BOpt_AppendFileName (
//
//
// Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings
// Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings
// that overlap.
//
StrCpyS (TmpStr, MaxLen, Ptr + 3);
@@ -1132,7 +1132,7 @@ BOpt_AppendFileName (
//
//
// Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings
// Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings
// that overlap.
//
StrCpyS (TmpStr, MaxLen, Ptr + 2);
@@ -1146,7 +1146,7 @@ BOpt_AppendFileName (
}
FreePool (TmpStr);
return Str;
}
@@ -1497,7 +1497,7 @@ BOpt_GetDriverOptions (
if (DriverOrderList == NULL) {
return EFI_NOT_FOUND;
}
for (Index = 0; Index < DriverOrderListSize / sizeof (UINT16); Index++) {
UnicodeSPrint (
DriverString,
@@ -1676,20 +1676,20 @@ GetLegacyDeviceOrder (
UINTN Index;
UINTN OptionIndex;
UINT16 PageIdList[5];
UINTN PageNum;
UINTN PageNum;
UINTN VarSize;
UINT8 *VarData;
UINT8 *WorkingVarData;
UINT8 *VarData;
UINT8 *WorkingVarData;
LEGACY_DEV_ORDER_ENTRY *DevOrder;
UINT16 VarDevOrder;
UINT8 *DisMap;
UINT16 VarDevOrder;
UINT8 *DisMap;
BM_MENU_OPTION *OptionMenu;
BBS_TYPE BbsType;
UINT8 *LegacyOrder;
UINT8 *OldData;
UINT8 *OldData;
UINTN Pos;
UINTN Bit;
ASSERT (CallbackData != NULL);
PageIdList[0] = FORM_SET_FD_ORDER_ID;
@@ -1711,7 +1711,7 @@ GetLegacyDeviceOrder (
for (Index = 0; Index < PageNum; Index++) {
switch (PageIdList[Index]) {
case FORM_SET_FD_ORDER_ID:
OptionMenu = (BM_MENU_OPTION *) &LegacyFDMenu;
BbsType = BBS_FLOPPY;
@@ -1725,14 +1725,14 @@ GetLegacyDeviceOrder (
LegacyOrder = CallbackData->BmmFakeNvData.LegacyHD;
OldData = CallbackData->BmmOldFakeNVData.LegacyHD;
break;
case FORM_SET_CD_ORDER_ID:
OptionMenu = (BM_MENU_OPTION *) &LegacyCDMenu;
BbsType = BBS_CDROM;
LegacyOrder = CallbackData->BmmFakeNvData.LegacyCD;
OldData = CallbackData->BmmOldFakeNVData.LegacyCD;
break;
case FORM_SET_NET_ORDER_ID:
OptionMenu = (BM_MENU_OPTION *) &LegacyNETMenu;
BbsType = BBS_EMBED_NETWORK;
@@ -1748,7 +1748,7 @@ GetLegacyDeviceOrder (
OldData = CallbackData->BmmOldFakeNVData.LegacyBEV;
break;
}
if (NULL != VarData) {
WorkingVarData = VarData;
DevOrder = (LEGACY_DEV_ORDER_ENTRY *) WorkingVarData;
@@ -1756,11 +1756,11 @@ GetLegacyDeviceOrder (
if (DevOrder->BbsType == BbsType) {
break;
}
WorkingVarData = (UINT8 *)((UINTN)WorkingVarData + sizeof (BBS_TYPE));
WorkingVarData += *(UINT16 *) WorkingVarData;
DevOrder = (LEGACY_DEV_ORDER_ENTRY *) WorkingVarData;
}
}
for (OptionIndex = 0; OptionIndex < OptionMenu->MenuNumber; OptionIndex++) {
VarDevOrder = *(UINT16 *) ((UINTN) DevOrder + sizeof (BBS_TYPE) + sizeof (UINT16) + OptionIndex * sizeof (UINT16));
if (0xFF00 == (VarDevOrder & 0xFF00)) {
@@ -1771,17 +1771,17 @@ GetLegacyDeviceOrder (
} else {
LegacyOrder[OptionIndex] = (UINT8) (VarDevOrder & 0xFF);
}
}
}
CopyMem (OldData, LegacyOrder, 100);
}
}
}
}
/**
Get driver option order from globalc DriverOptionMenu.
@param CallbackData The BMM context data.
**/
VOID
GetDriverOrder (

78
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
View File

@@ -1,7 +1,7 @@
/** @file
handles console redirection from boot manager
Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -32,7 +32,7 @@ UART_FLOW_CONTROL_DEVICE_PATH mFlowControlDevicePath =
Check the device path node whether it's the Flow Control node or not.
@param[in] FlowControl The device path node to be checked.
@retval TRUE It's the Flow Control node.
@retval FALSE It's not.
@@ -85,11 +85,11 @@ UpdateComAttributeFromVariable (
/**
Update the multi-instance device path of Terminal Device based on
the global TerminalMenu. If ChangeTernimal is TRUE, the terminal
the global TerminalMenu. If ChangeTernimal is TRUE, the terminal
device path in the Terminal Device in TerminalMenu is also updated.
@param DevicePath The multi-instance device path.
@param ChangeTerminal TRUE, then device path in the Terminal Device
@param ChangeTerminal TRUE, then device path in the Terminal Device
in TerminalMenu is also updated; FALSE, no update.
@return EFI_SUCCESS The function completes successfully.
@@ -760,7 +760,7 @@ UpdateComAttributeFromVariable (
and BM_CONSOLE_ERR_CONTEXT_SELECT.
@retval EFI_UNSUPPORTED The type passed in is not in the 3 types defined.
@retval EFI_NOT_FOUND If the EFI Variable defined in UEFI spec with name "ConOutDev",
@retval EFI_NOT_FOUND If the EFI Variable defined in UEFI spec with name "ConOutDev",
"ConInDev" or "ConErrDev" doesn't exists.
@retval EFI_OUT_OF_RESOURCES Not enough resource to complete the operations.
@retval EFI_SUCCESS Function completes successfully.
@@ -1057,24 +1057,24 @@ GetConsoleOutMode (
@param CallbackData The BMM context data.
**/
VOID
**/
VOID
GetConsoleInCheck (
IN BMM_CALLBACK_DATA *CallbackData
)
{
UINT16 Index;
BM_MENU_ENTRY *NewMenuEntry;
BM_MENU_ENTRY *NewMenuEntry;
UINT8 *ConInCheck;
BM_CONSOLE_CONTEXT *NewConsoleContext;
ASSERT (CallbackData != NULL);
ConInCheck = &CallbackData->BmmFakeNvData.ConsoleInCheck[0];
for (Index = 0; ((Index < ConsoleInpMenu.MenuNumber) && \
(Index < MAX_MENU_NUMBER)) ; Index++) {
(Index < MAX_MENU_NUMBER)) ; Index++) {
NewMenuEntry = BOpt_GetMenuEntry (&ConsoleInpMenu, Index);
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;
ConInCheck[Index] = NewConsoleContext->IsActive;
}
}
@@ -1086,27 +1086,27 @@ GetConsoleInCheck (
@param CallbackData The BMM context data.
**/
VOID
**/
VOID
GetConsoleOutCheck (
IN BMM_CALLBACK_DATA *CallbackData
)
{
UINT16 Index;
BM_MENU_ENTRY *NewMenuEntry;
BM_MENU_ENTRY *NewMenuEntry;
UINT8 *ConOutCheck;
BM_CONSOLE_CONTEXT *NewConsoleContext;
ASSERT (CallbackData != NULL);
ConOutCheck = &CallbackData->BmmFakeNvData.ConsoleOutCheck[0];
for (Index = 0; ((Index < ConsoleOutMenu.MenuNumber) && \
(Index < MAX_MENU_NUMBER)) ; Index++) {
(Index < MAX_MENU_NUMBER)) ; Index++) {
NewMenuEntry = BOpt_GetMenuEntry (&ConsoleOutMenu, Index);
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;
ConOutCheck[Index] = NewConsoleContext->IsActive;
}
}
/**
Initialize standard error output device check box to ConsoleErrCheck[MAX_MENU_NUMBER]
@@ -1114,23 +1114,23 @@ GetConsoleOutCheck (
@param CallbackData The BMM context data.
**/
VOID
**/
VOID
GetConsoleErrCheck (
IN BMM_CALLBACK_DATA *CallbackData
)
{
UINT16 Index;
BM_MENU_ENTRY *NewMenuEntry;
BM_MENU_ENTRY *NewMenuEntry;
UINT8 *ConErrCheck;
BM_CONSOLE_CONTEXT *NewConsoleContext;
ASSERT (CallbackData != NULL);
ConErrCheck = &CallbackData->BmmFakeNvData.ConsoleErrCheck[0];
for (Index = 0; ((Index < ConsoleErrMenu.MenuNumber) && \
(Index < MAX_MENU_NUMBER)) ; Index++) {
(Index < MAX_MENU_NUMBER)) ; Index++) {
NewMenuEntry = BOpt_GetMenuEntry (&ConsoleErrMenu, Index);
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;
NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;
ConErrCheck[Index] = NewConsoleContext->IsActive;
}
}
@@ -1142,23 +1142,23 @@ GetConsoleErrCheck (
@param CallbackData The BMM context data.
**/
VOID
**/
VOID
GetTerminalAttribute (
IN BMM_CALLBACK_DATA *CallbackData
)
{
BMM_FAKE_NV_DATA *CurrentFakeNVMap;
BM_MENU_ENTRY *NewMenuEntry;
BM_TERMINAL_CONTEXT *NewTerminalContext;
UINT16 TerminalIndex;
BM_TERMINAL_CONTEXT *NewTerminalContext;
UINT16 TerminalIndex;
UINT8 AttributeIndex;
ASSERT (CallbackData != NULL);
CurrentFakeNVMap = &CallbackData->BmmFakeNvData;
CurrentFakeNVMap = &CallbackData->BmmFakeNvData;
for (TerminalIndex = 0; ((TerminalIndex < TerminalMenu.MenuNumber) && \
(TerminalIndex < MAX_MENU_NUMBER)); TerminalIndex++) {
(TerminalIndex < MAX_MENU_NUMBER)); TerminalIndex++) {
NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, TerminalIndex);
NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;
for (AttributeIndex = 0; AttributeIndex < sizeof (BaudRateList) / sizeof (BaudRateList [0]); AttributeIndex++) {
@@ -1172,27 +1172,27 @@ GetTerminalAttribute (
NewTerminalContext->DataBitsIndex = AttributeIndex;
break;
}
}
}
for (AttributeIndex = 0; AttributeIndex < ARRAY_SIZE (ParityList); AttributeIndex++) {
if (NewTerminalContext->Parity == (UINT64) (ParityList[AttributeIndex].Value)) {
NewTerminalContext->ParityIndex = AttributeIndex;
break;
}
}
}
for (AttributeIndex = 0; AttributeIndex < ARRAY_SIZE (StopBitsList); AttributeIndex++) {
if (NewTerminalContext->StopBits == (UINT64) (StopBitsList[AttributeIndex].Value)) {
NewTerminalContext->StopBitsIndex = AttributeIndex;
break;
}
}
}
CurrentFakeNVMap->COMBaudRate[TerminalIndex] = NewTerminalContext->BaudRateIndex;
CurrentFakeNVMap->COMDataRate[TerminalIndex] = NewTerminalContext->DataBitsIndex;
CurrentFakeNVMap->COMStopBits[TerminalIndex] = NewTerminalContext->StopBitsIndex;
CurrentFakeNVMap->COMParity[TerminalIndex] = NewTerminalContext->ParityIndex;
CurrentFakeNVMap->COMParity[TerminalIndex] = NewTerminalContext->ParityIndex;
CurrentFakeNVMap->COMTerminalType[TerminalIndex] = NewTerminalContext->TerminalType;
CurrentFakeNVMap->COMFlowControl[TerminalIndex] = NewTerminalContext->FlowControl;
}
}
}

12
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
View File

@@ -1,16 +1,16 @@
///** @file
//
//
// File Explorer Formset
//
// Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
//
// Copyright (c) 2004 - 2018, 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
// http://opensource.org/licenses/bsd-license.php
//
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
//
//**/
#include "FormGuid.h"
@@ -124,4 +124,4 @@ formset
endform;
endformset;
endformset;

16
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
View File

@@ -1,7 +1,7 @@
/** @file
File explorer related functions.
Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -236,7 +236,7 @@ UpdateFileExplorer (
@param[in] This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.
@param[in] Configuration A null-terminated Unicode string in
<ConfigString> format.
<ConfigString> format.
@param[out] Progress A pointer to a string filled in with the
offset of the most recent '&' before the
first failing name / value pair (or the
@@ -246,7 +246,7 @@ UpdateFileExplorer (
successful.
@retval EFI_SUCCESS The results have been distributed or are
awaiting distribution.
awaiting distribution.
@retval EFI_OUT_OF_RESOURCES Not enough memory to store the
parts of the results that must be
stored awaiting possible future
@@ -289,8 +289,8 @@ FileExplorerRouteConfig (
}
Status = gBS->LocateProtocol (
&gEfiHiiConfigRoutingProtocolGuid,
NULL,
&gEfiHiiConfigRoutingProtocolGuid,
NULL,
(VOID**) &ConfigRouting
);
if (EFI_ERROR (Status)) {
@@ -393,7 +393,7 @@ FileExplorerCallback (
//
return EFI_UNSUPPORTED;
}
Status = EFI_SUCCESS;
Private = FE_CALLBACK_DATA_FROM_THIS (This);
@@ -407,7 +407,7 @@ FileExplorerCallback (
if ((Value == NULL) || (ActionRequest == NULL)) {
return EFI_INVALID_PARAMETER;
}
if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT) {
NvRamMap->BootOptionChanged = FALSE;
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;
@@ -451,7 +451,7 @@ FileExplorerCallback (
if (Value == NULL) {
return EFI_INVALID_PARAMETER;
}
if (QuestionId >= FILE_OPTION_GOTO_OFFSET) {
//
// function will always return FALSE, no need to check here.

54
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
View File

@@ -1,7 +1,7 @@
/** @file
Dynamically update the pages.
Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -25,7 +25,7 @@ RefreshUpdateData (
{
//
// Free current updated date
//
//
if (mStartOpCodeHandle != NULL) {
HiiFreeOpCodeHandle (mStartOpCodeHandle);
}
@@ -46,7 +46,7 @@ RefreshUpdateData (
/**
Add a "Go back to main page" tag in front of the form when there are no
"Apply changes" and "Discard changes" tags in the end of the form.
@param CallbackData The BMM context data.
**/
@@ -131,7 +131,7 @@ UpdatePageEnd (
}
/**
Clean up the dynamic opcode at label and form specified by both LabelId.
Clean up the dynamic opcode at label and form specified by both LabelId.
@param LabelId It is both the Form ID and Label ID for opcode deletion.
@param CallbackData The BMM context data.
@@ -345,7 +345,7 @@ UpdateDrvDelPage (
UpdatePageStart (CallbackData);
CreateMenuStringToken (CallbackData, CallbackData->BmmHiiHandle, &DriverOptionMenu);
ASSERT (DriverOptionMenu.MenuNumber <= (sizeof (CallbackData->BmmFakeNvData.DriverOptionDel) / sizeof (CallbackData->BmmFakeNvData.DriverOptionDel[0])));
for (Index = 0; Index < DriverOptionMenu.MenuNumber; Index++) {
NewMenuEntry = BOpt_GetMenuEntry (&DriverOptionMenu, Index);
@@ -380,7 +380,7 @@ UpdateDrvDelPage (
}
/**
Prepare the page to allow user to add description for
Prepare the page to allow user to add description for
a Driver Option.
@param CallbackData The BMM context data.
@@ -552,11 +552,11 @@ UpdateOrderPage (
UpdatePageStart (CallbackData);
CreateMenuStringToken (CallbackData, CallbackData->BmmHiiHandle, OptionMenu);
OptionOrder = NULL;
QuestionId = 0;
VarOffset = 0;
switch (UpdatePageId) {
switch (UpdatePageId) {
case FORM_BOOT_CHG_ID:
//
@@ -587,12 +587,12 @@ UpdateOrderPage (
QuestionId = DRIVER_OPTION_ORDER_QUESTION_ID;
VarOffset = DRIVER_OPTION_ORDER_VAR_OFFSET;
break;
}
}
ASSERT (OptionOrder != NULL);
OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();
ASSERT (OptionsOpCodeHandle != NULL);
NewMenuEntry = NULL;
for (OptionIndex = 0; (OptionIndex < MAX_MENU_NUMBER && OptionOrder[OptionIndex] != 0); OptionIndex++) {
BootOptionFound = FALSE;
@@ -613,21 +613,21 @@ UpdateOrderPage (
);
}
}
if (OptionMenu->MenuNumber > 0) {
HiiCreateOrderedListOpCode (
mStartOpCodeHandle, // Container for dynamic created opcodes
QuestionId, // Question ID
VARSTORE_ID_BOOT_MAINT, // VarStore ID
VarOffset, // Offset in Buffer Storage
STRING_TOKEN (STR_CHANGE_ORDER), // Question prompt text
STRING_TOKEN (STR_CHANGE_ORDER), // Question help text
0, // Question flag
HiiCreateOrderedListOpCode (
mStartOpCodeHandle, // Container for dynamic created opcodes
QuestionId, // Question ID
VARSTORE_ID_BOOT_MAINT, // VarStore ID
VarOffset, // Offset in Buffer Storage
STRING_TOKEN (STR_CHANGE_ORDER), // Question prompt text
STRING_TOKEN (STR_CHANGE_ORDER), // Question help text
0, // Question flag
0, // Ordered list flag, e.g. EFI_IFR_UNIQUE_SET
EFI_IFR_TYPE_NUM_SIZE_32, // Data type of Question value
100, // Maximum container
OptionsOpCodeHandle, // Option Opcode list
NULL // Default Opcode is NULL
EFI_IFR_TYPE_NUM_SIZE_32, // Data type of Question value
100, // Maximum container
OptionsOpCodeHandle, // Option Opcode list
NULL // Default Opcode is NULL
);
}
@@ -706,7 +706,7 @@ UpdateBootNextPage (
EFI_IFR_TYPE_NUM_SIZE_16,
Index
);
}
}
HiiCreateOneOfOpCode (
mStartOpCodeHandle,
@@ -765,7 +765,7 @@ UpdateTimeOutPage (
0,
DefaultOpCodeHandle
);
HiiFreeOpCodeHandle (DefaultOpCodeHandle);
//CallbackData->BmmFakeNvData.BootTimeOut = BootTimeOut;
@@ -840,7 +840,7 @@ UpdateConModePage (
if (EFI_ERROR (Status)) {
continue;
}
//
// Build mode string Column x Row
//
@@ -956,7 +956,7 @@ UpdateTerminalPage (
OptionsOpCodeHandle,
NULL
);
HiiFreeOpCodeHandle (OptionsOpCodeHandle);
OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();
ASSERT (OptionsOpCodeHandle != NULL);

30
IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
View File

@@ -1,7 +1,7 @@
/** @file
Variable operation that will be used by bootmaint
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -19,10 +19,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
After deleting this boot option, call Var_ChangeBootOrder to
make sure BootOrder is in valid state.
@retval EFI_SUCCESS If all boot load option EFI Variables corresponding to
@retval EFI_SUCCESS If all boot load option EFI Variables corresponding to
BM_LOAD_CONTEXT marked for deletion is deleted.
@retval EFI_NOT_FOUND If can not find the boot option want to be deleted.
@return Others If failed to update the "BootOrder" variable after deletion.
@return Others If failed to update the "BootOrder" variable after deletion.
**/
EFI_STATUS
@@ -86,7 +86,7 @@ Var_DelBootOption (
scratch by content from BootOptionMenu is needed.
@retval EFI_SUCCESS The boot order is updated successfully.
@return EFI_STATUS other than EFI_SUCCESS if failed to
@@ -313,7 +313,7 @@ Var_ChangeDriverOrder (
}
/**
Update the device path of "ConOut", "ConIn" and "ErrOut"
Update the device path of "ConOut", "ConIn" and "ErrOut"
based on the new BaudRate, Data Bits, parity and Stop Bits
set.
@@ -383,7 +383,7 @@ Var_UpdateAllConsoleOption (
This function clear the EFI variable defined by ConsoleName and
gEfiGlobalVariableGuid. It then build the multi-instance device
path by appending the device path of the Console (In/Out/Err) instance
path by appending the device path of the Console (In/Out/Err) instance
in ConsoleMenu. Then it scan all corresponding console device by
scanning Terminal (built from device supporting Serial I/O instances)
devices in TerminalMenu. At last, it save a EFI variable specifed
@@ -447,7 +447,7 @@ Var_UpdateConsoleOption (
) {
Vendor.Header.Type = MESSAGING_DEVICE_PATH;
Vendor.Header.SubType = MSG_VENDOR_DP;
ASSERT (NewTerminalContext->TerminalType < (ARRAY_SIZE (TerminalTypeGuid)));
CopyMem (
&Vendor.Guid,
@@ -520,7 +520,7 @@ Var_UpdateConsoleOutOption (
console device.
@retval EFI_SUCCESS The function complete successfully.
@return The EFI variable can not be saved. See gRT->SetVariable for detail return information.
@return The EFI variable can not be saved. See gRT->SetVariable for detail return information.
**/
EFI_STATUS
Var_UpdateErrorOutOption (
@@ -531,8 +531,8 @@ Var_UpdateErrorOutOption (
}
/**
This function create a currently loaded Drive Option from
the BMM. It then appends this Driver Option to the end of
This function create a currently loaded Drive Option from
the BMM. It then appends this Driver Option to the end of
the "DriverOrder" list. It append this Driver Opotion to the end
of DriverOptionMenu.
@@ -726,8 +726,8 @@ Var_UpdateDriverOption (
}
/**
This function create a currently loaded Boot Option from
the BMM. It then appends this Boot Option to the end of
This function create a currently loaded Boot Option from
the BMM. It then appends this Boot Option to the end of
the "BootOrder" list. It also append this Boot Opotion to the end
of BootOptionMenu.
@@ -911,7 +911,7 @@ Var_UpdateBootOption (
}
/**
This function update the "BootNext" EFI Variable. If there is
This function update the "BootNext" EFI Variable. If there is
no "BootNext" specified in BMM, this EFI Variable is deleted.
It also update the BMM context data specified the "BootNext"
vaule.
@@ -919,7 +919,7 @@ Var_UpdateBootOption (
@param CallbackData The BMM context data.
@retval EFI_SUCCESS The function complete successfully.
@return The EFI variable can be saved. See gRT->SetVariable
@return The EFI variable can be saved. See gRT->SetVariable
for detail return information.
**/
@@ -1105,7 +1105,7 @@ Var_UpdateDriverOrder (
// Changing the content without increasing its size with current variable implementation shouldn't fail.
//
ASSERT_EFI_ERROR (Status);
BOpt_FreeMenu (&DriverOptionMenu);
BOpt_GetDriverOptions (CallbackData);
return EFI_SUCCESS;

12
IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
View File

@@ -1,7 +1,7 @@
/** @file
The platform boot manager reference implementation
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -44,7 +44,7 @@ HII_VENDOR_DEVICE_PATH mBootManagerHiiVendorDevicePath = {
{
END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
{
{
(UINT8) (END_DEVICE_PATH_LENGTH),
(UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
}
@@ -187,10 +187,10 @@ InitializeBootManager (
/**
This function invokes Boot Manager. If all devices have not a chance to be connected,
the connect all will be triggered. It then enumerate all boot options. If
the connect all will be triggered. It then enumerate all boot options. If
a boot option from the Boot Manager page is selected, Boot Manager will boot
from this boot option.
**/
VOID
CallBootManager (
@@ -294,7 +294,7 @@ CallBootManager (
NeedEndOp = FALSE;
HiiCreateEndOpCode (StartOpCodeHandle);
}
if (IsLegacyOption && DeviceType != ((BBS_BBS_DEVICE_PATH *) Option->DevicePath)->DeviceType) {
if (NeedEndOp) {
HiiCreateEndOpCode (StartOpCodeHandle);
@@ -314,7 +314,7 @@ CallBootManager (
}
ASSERT (Option->Description != NULL);
Token = HiiSetString (HiiHandle, 0, Option->Description, NULL);
TempStr = DevicePathToStr (Option->DevicePath);

6
IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
View File

@@ -1,7 +1,7 @@
/** @file
The platform boot manager reference implement
Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -90,10 +90,10 @@ InitializeBootManager (
/**
This function invokes Boot Manager. If all devices have not a chance to be connected,
the connect all will be triggered. It then enumerate all boot options. If
the connect all will be triggered. It then enumerate all boot options. If
a boot option from the Boot Manager page is selected, Boot Manager will boot
from this boot option.
**/
VOID
CallBootManager (

10
IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerStrings.uni
View File

@@ -1,16 +1,16 @@
///** @file
//
//
// String definitions for BdsPlatform formset.
//
// Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
//
// Copyright (c) 2004 - 2018, 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
// http://opensource.org/licenses/bsd-license.php
//
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
//
//**/
/=#

30
IntelFrameworkModulePkg/Universal/BdsDxe/Capsules.c
View File

@@ -1,7 +1,7 @@
/** @file
BDS routines to handle capsules.
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -51,7 +51,7 @@ BdsProcessCapsules (
UINT32 CacheNumber;
VOID **CapsulePtr;
VOID **CapsulePtrCache;
EFI_GUID *CapsuleGuidCache;
EFI_GUID *CapsuleGuidCache;
BOOLEAN NeedReset;
CapsuleNumber = 0;
@@ -70,7 +70,7 @@ BdsProcessCapsules (
DEBUG ((EFI_D_ERROR, "Boot mode is not correct for capsule update.\n"));
return EFI_INVALID_PARAMETER;
}
Status = EFI_SUCCESS;
//
// Find all capsule images from hob
@@ -80,7 +80,7 @@ BdsProcessCapsules (
CapsuleTotalNumber ++;
HobPointer.Raw = GET_NEXT_HOB (HobPointer);
}
if (CapsuleTotalNumber == 0) {
//
// We didn't find a hob, so had no errors.
@@ -92,7 +92,7 @@ BdsProcessCapsules (
PlatformBdsLockNonUpdatableFlash ();
return EFI_SUCCESS;
}
//
// Init temp Capsule Data table.
//
@@ -102,7 +102,7 @@ BdsProcessCapsules (
ASSERT (CapsulePtrCache != NULL);
CapsuleGuidCache = (EFI_GUID *) AllocateZeroPool (sizeof (EFI_GUID) * CapsuleTotalNumber);
ASSERT (CapsuleGuidCache != NULL);
//
// Find all capsule images from hob
//
@@ -119,12 +119,12 @@ BdsProcessCapsules (
//
// Capsules who have CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE always are used for operating
// System to have information persist across a system reset. EFI System Table must
// System to have information persist across a system reset. EFI System Table must
// point to an array of capsules that contains the same CapsuleGuid value. And agents
// searching for this type capsule will look in EFI System Table and search for the
// searching for this type capsule will look in EFI System Table and search for the
// capsule's Guid and associated pointer to retrieve the data. Two steps below describes
// how to sorting the capsules by the unique guid and install the array to EFI System Table.
// Firstly, Loop for all coalesced capsules, record unique CapsuleGuids and cache them in an
// how to sorting the capsules by the unique guid and install the array to EFI System Table.
// Firstly, Loop for all coalesced capsules, record unique CapsuleGuids and cache them in an
// array for later sorting capsules by CapsuleGuid.
//
for (Index = 0; Index < CapsuleTotalNumber; Index++) {
@@ -132,7 +132,7 @@ BdsProcessCapsules (
if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0) {
//
// For each capsule, we compare it with known CapsuleGuid in the CacheArray.
// If already has the Guid, skip it. Whereas, record it in the CacheArray as
// If already has the Guid, skip it. Whereas, record it in the CacheArray as
// an additional one.
//
CacheIndex = 0;
@@ -159,7 +159,7 @@ BdsProcessCapsules (
//
CacheIndex = 0;
while (CacheIndex < CacheNumber) {
CapsuleNumber = 0;
CapsuleNumber = 0;
for (Index = 0; Index < CapsuleTotalNumber; Index++) {
CapsuleHeader = (EFI_CAPSULE_HEADER*) CapsulePtr [Index];
if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) != 0) {
@@ -172,7 +172,7 @@ BdsProcessCapsules (
}
}
if (CapsuleNumber != 0) {
Size = sizeof(EFI_CAPSULE_TABLE) + (CapsuleNumber - 1) * sizeof(VOID*);
Size = sizeof(EFI_CAPSULE_TABLE) + (CapsuleNumber - 1) * sizeof(VOID*);
CapsuleTable = AllocateRuntimePool (Size);
ASSERT (CapsuleTable != NULL);
CapsuleTable->CapsuleArrayNumber = CapsuleNumber;
@@ -185,7 +185,7 @@ BdsProcessCapsules (
//
// Besides ones with CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE flag, all capsules left are
// recognized by platform with CapsuleGuid. For general platform driver, UpdateFlash
// recognized by platform with CapsuleGuid. For general platform driver, UpdateFlash
// type is commonly supported, so here only deal with encapsuled FVs capsule. Additional
// type capsule transaction could be extended. It depends on platform policy.
//
@@ -220,7 +220,7 @@ BdsProcessCapsules (
}
PlatformBdsLockNonUpdatableFlash ();
//
// Free the allocated temp memory space.
//

256
IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
View File

@@ -1,7 +1,7 @@
/** @file
The platform device manager reference implementation
Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -43,7 +43,7 @@ EFI_STRING mSelectedMacAddrString;
//
// Which form Id need to be show.
//
EFI_FORM_ID mNextShowFormId = DEVICE_MANAGER_FORM_ID;
EFI_FORM_ID mNextShowFormId = DEVICE_MANAGER_FORM_ID;
//
// The Mac Address show in the NETWORK_DEVICE_LIST_FORM_ID
@@ -74,7 +74,7 @@ HII_VENDOR_DEVICE_PATH mDeviceManagerHiiVendorDevicePath = {
{
END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
{
{
(UINT8) (END_DEVICE_PATH_LENGTH),
(UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
}
@@ -96,7 +96,7 @@ HII_VENDOR_DEVICE_PATH mDriverHealthHiiVendorDevicePath = {
{
END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
{
{
(UINT8) (END_DEVICE_PATH_LENGTH),
(UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
}
@@ -240,7 +240,7 @@ ExtractDisplayedHiiFormFromHiiHandle (
UINT8 ClassGuidNum;
ASSERT (Handle != NULL);
ASSERT (SetupClassGuid != NULL);
ASSERT (SetupClassGuid != NULL);
ASSERT (FormSetTitle != NULL);
ASSERT (FormSetHelp != NULL);
@@ -263,7 +263,7 @@ ExtractDisplayedHiiFormFromHiiHandle (
// The return status should always be EFI_BUFFER_TOO_SMALL as input buffer's size is 0.
//
ASSERT (Status == EFI_BUFFER_TOO_SMALL);
HiiPackageList = AllocatePool (BufferSize);
ASSERT (HiiPackageList != NULL);
@@ -326,7 +326,7 @@ ExtractDisplayedHiiFormFromHiiHandle (
}
}
}
//
// Go to next package
//
@@ -341,12 +341,12 @@ ExtractDisplayedHiiFormFromHiiHandle (
/**
Get the mac address string from the device path.
if the device path has the vlan, get the vanid also.
@param MacAddressNode Device path begin with mac address
@param MacAddressNode Device path begin with mac address
@param PBuffer Output string buffer contain mac address.
**/
BOOLEAN
BOOLEAN
GetMacAddressString(
IN MAC_ADDR_DEVICE_PATH *MacAddressNode,
OUT CHAR16 **PBuffer
@@ -382,7 +382,7 @@ GetMacAddressString(
*PBuffer = String;
StrCpyS (String, BufferLen / sizeof (CHAR16), L"MAC:");
String += 4;
//
// Convert the MAC address into a unicode string.
//
@@ -400,7 +400,7 @@ GetMacAddressString(
*String++ = L':';
}
}
//
// If VLAN is configured, it will need extra 5 characters like "\0005".
// Plus one unicode character for the null-terminator.
@@ -442,7 +442,7 @@ GetMacAddressString(
@retval EFI_SUCCESS Add the item is successful.
@return Other values if failed to Add the item.
**/
BOOLEAN
BOOLEAN
AddIdToMacDeviceList (
IN EFI_STRING MacAddrString
)
@@ -488,13 +488,13 @@ AddIdToMacDeviceList (
} else {
TempDeviceList = (MENU_INFO_ITEM *)AllocatePool (sizeof (MENU_INFO_ITEM) * mMacDeviceList.MaxListLen);
}
if (TempDeviceList == NULL) {
return FALSE;
}
TempDeviceList[mMacDeviceList.CurListLen].PromptId = PromptId;
TempDeviceList[mMacDeviceList.CurListLen].PromptId = PromptId;
TempDeviceList[mMacDeviceList.CurListLen].QuestionId = (EFI_QUESTION_ID) (mMacDeviceList.CurListLen + NETWORK_DEVICE_LIST_KEY_OFFSET);
mMacDeviceList.NodeList = TempDeviceList;
}
mMacDeviceList.CurListLen ++;
@@ -511,9 +511,9 @@ AddIdToMacDeviceList (
@param *Node Input device which need to be check.
@param *NeedAddItem Whether need to add the menu in the network device list.
@retval TRUE Has mac address device path.
@retval FALSE NOT Has mac address device path.
@retval FALSE NOT Has mac address device path.
**/
BOOLEAN
@@ -525,7 +525,7 @@ IsMacAddressDevicePath (
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
CHAR16 *Buffer;
BOOLEAN ReturnVal;
ASSERT (Node != NULL);
*NeedAddItem = FALSE;
ReturnVal = FALSE;
@@ -540,12 +540,12 @@ IsMacAddressDevicePath (
if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
(DevicePathSubType (DevicePath) == MSG_MAC_ADDR_DP)) {
ReturnVal = TRUE;
if (DEVICE_MANAGER_FORM_ID == mNextShowFormId) {
*NeedAddItem = TRUE;
break;
}
}
if (!GetMacAddressString((MAC_ADDR_DEVICE_PATH*)DevicePath, &Buffer)) {
break;
}
@@ -559,7 +559,7 @@ IsMacAddressDevicePath (
if (NETWORK_DEVICE_LIST_FORM_ID == mNextShowFormId) {
//
// Same handle may has two network child handle, so the questionid
// Same handle may has two network child handle, so the questionid
// has the offset of SAME_HANDLE_KEY_OFFSET.
//
if (AddIdToMacDeviceList (Buffer)) {
@@ -567,7 +567,7 @@ IsMacAddressDevicePath (
}
break;
}
}
}
DevicePath = NextDevicePathNode (DevicePath);
}
@@ -588,7 +588,7 @@ IsMacAddressDevicePath (
@return FALSE Do not need to add the menu about the network.
**/
BOOLEAN
BOOLEAN
IsNeedAddNetworkMenu (
IN EFI_HII_HANDLE Handle,
OUT UINTN *ItemCount
@@ -596,7 +596,7 @@ IsNeedAddNetworkMenu (
{
EFI_STATUS Status;
UINTN EntryCount;
UINTN Index;
UINTN Index;
EFI_HANDLE DriverHandle;
EFI_HANDLE ControllerHandle;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
@@ -625,9 +625,9 @@ IsNeedAddNetworkMenu (
}
TmpDevicePath = DevicePath;
//
//
// Check whether this device path include mac address device path.
// If this path has mac address path, get the value whether need
// If this path has mac address path, get the value whether need
// add this info to the menu and return.
// Else check more about the child handle devcie path.
//
@@ -649,7 +649,7 @@ IsNeedAddNetworkMenu (
}
if (!IsDevicePathEnd (TmpDevicePath)) {
return FALSE;
return FALSE;
}
//
@@ -688,7 +688,7 @@ IsNeedAddNetworkMenu (
continue;
}
//
//
// Check whether this device path include mac address device path.
//
if (!IsMacAddressDevicePath(ChildDevicePath, &IsNeedAdd)) {
@@ -708,7 +708,7 @@ IsNeedAddNetworkMenu (
} else {
//
// If need to update other form, return whether need to add to the menu.
//
//
goto Done;
}
}
@@ -717,9 +717,9 @@ IsNeedAddNetworkMenu (
Done:
if (OpenInfoBuffer != NULL) {
FreePool (OpenInfoBuffer);
FreePool (OpenInfoBuffer);
}
return IsNeedAdd;
return IsNeedAdd;
}
/**
@@ -749,7 +749,7 @@ GetHiiHandleCount (
@param HiiHandles The input HiiHandle array.
@param GuidLists The input form set guid lists.
@param ArrayCount The input array count, new array will be arraycount + 1 size.
@param Offset The current used HiiHandle's Offset.
@param Offset The current used HiiHandle's Offset.
@param FormSetGuid The new found formset guid.
**/
@@ -793,7 +793,7 @@ AdjustArrayData (
This function create the dynamic content for device manager. It includes
section header for all class of devices, one-of opcode to set VBIOS.
@retval EFI_SUCCESS Operation is successful.
@return Other values if failed to clean up the dynamic content from HII
database.
@@ -883,7 +883,7 @@ CallDeviceManager (
NewStringLen += (StrLen(String) + 2) * 2;
NewStringTitle = AllocatePool (NewStringLen);
UnicodeSPrint (NewStringTitle, NewStringLen, L"%s %s", String, mSelectedMacAddrString);
HiiSetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);
HiiSetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);
FreePool (String);
FreePool (NewStringTitle);
}
@@ -941,9 +941,9 @@ CallDeviceManager (
}
//
// One HiiHandle has more than one formset can be shown,
// One HiiHandle has more than one formset can be shown,
// Insert a new pair of HiiHandle + Guid to the HiiHandles and GuidLists list.
//
//
if (SkipCount > 0) {
AdjustArrayData (&HiiHandles, &GuidLists, HandleNum, Index + 1, FormSetGuid);
HandleNum ++;
@@ -968,7 +968,7 @@ CallDeviceManager (
//
// Network device process
//
//
if (IsNeedAddNetworkMenu (HiiHandles[Index], &AddItemCount)) {
if (mNextShowFormId == DEVICE_MANAGER_FORM_ID) {
//
@@ -1015,7 +1015,7 @@ CallDeviceManager (
}
} else {
//
//
//
// Not network device process, only need to show at device manger form.
//
if (mNextShowFormId == DEVICE_MANAGER_FORM_ID) {
@@ -1128,7 +1128,7 @@ CallDeviceManager (
}
//
// Driver Health item chose.
// Driver Health item chose.
//
if (gCallbackKey == DEVICE_MANAGER_KEY_DRIVER_HEALTH) {
CallDriverHealth ();
@@ -1152,7 +1152,7 @@ CallDeviceManager (
// In this case, go from the network device list to the specify device.
//
if ((gCallbackKey < MAX_KEY_SECTION_LEN + NETWORK_DEVICE_LIST_KEY_OFFSET ) && (gCallbackKey >= NETWORK_DEVICE_LIST_KEY_OFFSET)) {
mNextShowFormId = NETWORK_DEVICE_FORM_ID;
mNextShowFormId = NETWORK_DEVICE_FORM_ID;
gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER;
goto Done;
}
@@ -1237,10 +1237,10 @@ DriverHealthCallback (
}
/**
Collect and display the platform's driver health relative information, allow user to do interactive
Collect and display the platform's driver health relative information, allow user to do interactive
operation while the platform is unhealthy.
This function display a form which divided into two parts. The one list all modules which has installed
This function display a form which divided into two parts. The one list all modules which has installed
driver health protocol. The list usually contain driver name, controller name, and it's health info.
While the driver name can't be retrieved, will use device path as backup. The other part of the form provide
a choice to the user to repair all platform.
@@ -1251,7 +1251,7 @@ CallDriverHealth (
VOID
)
{
EFI_STATUS Status;
EFI_STATUS Status;
EFI_HII_HANDLE HiiHandle;
EFI_BROWSER_ACTION_REQUEST ActionRequest;
EFI_IFR_GUID_LABEL *StartLabel;
@@ -1278,7 +1278,7 @@ CallDriverHealth (
UINTN StringSize;
Index = 0;
DriverHealthInfo = NULL;
DriverHealthInfo = NULL;
DriverDevicePath = NULL;
IsControllerNameEmpty = FALSE;
InitializeListHead (&DriverHealthList);
@@ -1352,8 +1352,8 @@ CallDriverHealth (
Link = GetFirstNode (&DriverHealthList);
while (!IsNull (&DriverHealthList, Link)) {
DriverHealthInfo = DEVICE_MANAGER_HEALTH_INFO_FROM_LINK (Link);
while (!IsNull (&DriverHealthList, Link)) {
DriverHealthInfo = DEVICE_MANAGER_HEALTH_INFO_FROM_LINK (Link);
Status = DriverHealthGetDriverName (DriverHealthInfo->DriverHandle, &DriverName);
if (EFI_ERROR (Status)) {
@@ -1366,9 +1366,9 @@ CallDriverHealth (
StringSize = StrSize (DriverName);
Status = DriverHealthGetControllerName (
DriverHealthInfo->DriverHandle,
DriverHealthInfo->ControllerHandle,
DriverHealthInfo->ChildHandle,
DriverHealthInfo->DriverHandle,
DriverHealthInfo->ControllerHandle,
DriverHealthInfo->ChildHandle,
&ControllerName
);
@@ -1379,24 +1379,24 @@ CallDriverHealth (
} else {
IsControllerNameEmpty = TRUE;
}
//
// Add the message of the Module itself provided after the string item.
//
if ((DriverHealthInfo->MessageList != NULL) && (DriverHealthInfo->MessageList->StringId != 0)) {
TmpString = HiiGetString (
DriverHealthInfo->MessageList->HiiHandle,
DriverHealthInfo->MessageList->StringId,
DriverHealthInfo->MessageList->HiiHandle,
DriverHealthInfo->MessageList->StringId,
NULL
);
ASSERT (TmpString != NULL);
StringSize += StrLen (L" ") * sizeof(CHAR16);
StringSize += StrLen (TmpString) * sizeof(CHAR16);
String = (EFI_STRING) AllocateZeroPool (StringSize);
ASSERT (String != NULL);
StrCpyS (String, StringSize / sizeof(CHAR16), DriverName);
if (!IsControllerNameEmpty) {
StrCatS (String, StringSize / sizeof(CHAR16), L" ");
@@ -1436,7 +1436,7 @@ CallDriverHealth (
String = (EFI_STRING) AllocateZeroPool (StringSize);
ASSERT (String != NULL);
StrCpyS (String, StringSize / sizeof (CHAR16), DriverName);
if (!IsControllerNameEmpty) {
StrCatS (String, StringSize / sizeof (CHAR16), L" ");
@@ -1464,14 +1464,14 @@ CallDriverHealth (
Index++;
Link = GetNextNode (&DriverHealthList, Link);
}
//
// Add End Opcode for Subtitle
//
//
HiiCreateEndOpCode (StartOpCodeHandle);
HiiCreateSubTitleOpCode (StartOpCodeHandleRepair, STRING_TOKEN (STR_DRIVER_HEALTH_REPAIR_ALL), 0, 0, 1);
TokenHelp = HiiSetString (HiiHandle, 0, GetStringById( STRING_TOKEN (STR_DH_REPAIR_ALL_HELP)), NULL);
TokenHelp = HiiSetString (HiiHandle, 0, GetStringById( STRING_TOKEN (STR_DH_REPAIR_ALL_HELP)), NULL);
if (PlaformHealthStatusCheck ()) {
//
@@ -1541,7 +1541,7 @@ CallDriverHealth (
// We will have returned from processing a callback - user either hit ESC to exit, or selected
// a target to display.
// Process the diver health status states here.
//
//
if (gCallbackKey >= DRIVER_HEALTH_KEY_OFFSET && gCallbackKey != DRIVER_HEALTH_REPAIR_ALL_KEY) {
ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;
@@ -1552,7 +1552,7 @@ CallDriverHealth (
//
// Got the item relative node in the List
//
if (Index == (gCallbackKey - DRIVER_HEALTH_KEY_OFFSET)) {
if (Index == (gCallbackKey - DRIVER_HEALTH_KEY_OFFSET)) {
DriverHealthInfo = DEVICE_MANAGER_HEALTH_INFO_FROM_LINK (Link);
//
// Process the driver's healthy status for the specify module
@@ -1560,7 +1560,7 @@ CallDriverHealth (
RebootRequired = FALSE;
ProcessSingleControllerHealth (
DriverHealthInfo->DriverHealth,
DriverHealthInfo->ControllerHandle,
DriverHealthInfo->ControllerHandle,
DriverHealthInfo->ChildHandle,
DriverHealthInfo->HealthStatus,
&(DriverHealthInfo->MessageList),
@@ -1579,9 +1579,9 @@ CallDriverHealth (
if (ActionRequest == EFI_BROWSER_ACTION_REQUEST_RESET) {
EnableResetRequired ();
}
//
// Force return to the form of Driver Health in Device Manager
// Force return to the form of Driver Health in Device Manager
//
gCallbackKey = DRIVER_HEALTH_RETURN_KEY;
}
@@ -1591,12 +1591,12 @@ CallDriverHealth (
//
if (gCallbackKey == DRIVER_HEALTH_REPAIR_ALL_KEY) {
ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;
PlatformRepairAll (&DriverHealthList);
gCallbackKey = DRIVER_HEALTH_RETURN_KEY;
}
//
// Remove driver health packagelist from HII database.
//
@@ -1615,13 +1615,13 @@ CallDriverHealth (
if (DriverHealthInfo->MessageList != NULL) {
FreePool(DriverHealthInfo->MessageList);
FreePool (DriverHealthInfo);
}
}
}
HiiFreeOpCodeHandle (StartOpCodeHandle);
HiiFreeOpCodeHandle (EndOpCodeHandle);
HiiFreeOpCodeHandle (EndOpCodeHandle);
HiiFreeOpCodeHandle (StartOpCodeHandleRepair);
HiiFreeOpCodeHandle (EndOpCodeHandleRepair);
HiiFreeOpCodeHandle (EndOpCodeHandleRepair);
if (gCallbackKey == DRIVER_HEALTH_RETURN_KEY) {
//
@@ -1639,11 +1639,11 @@ CallDriverHealth (
This function called by CheckAllControllersHealthStatus () function in order to process a specify
contoller's health state.
@param DriverHealthList A Pointer to the list contain all of the platform driver health information.
@param DriverHealthList A Pointer to the list contain all of the platform driver health information.
@param DriverHandle The handle of driver.
@param ControllerHandle The class guid specifies which form set will be displayed.
@param ChildHandle The handle of the child controller to retrieve the health
status on. This is an optional parameter that may be NULL.
@param ChildHandle The handle of the child controller to retrieve the health
status on. This is an optional parameter that may be NULL.
@param DriverHealth A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance.
@param HealthStatus The health status of the controller.
@@ -1740,7 +1740,7 @@ GetSingleControllerHealthStatus (
return EFI_OUT_OF_RESOURCES;
}
DriverHealthInfo->Signature = DEVICE_MANAGER_DRIVER_HEALTH_INFO_SIGNATURE;
DriverHealthInfo->Signature = DEVICE_MANAGER_DRIVER_HEALTH_INFO_SIGNATURE;
DriverHealthInfo->DriverHandle = DriverHandle;
DriverHealthInfo->ControllerHandle = ControllerHandle;
DriverHealthInfo->ChildHandle = ChildHandle;
@@ -1755,12 +1755,12 @@ GetSingleControllerHealthStatus (
}
/**
Collects all the EFI Driver Health Protocols currently present in the EFI Handle Database,
and queries each EFI Driver Health Protocol to determine if one or more of the controllers
managed by each EFI Driver Health Protocol instance are not healthy.
Collects all the EFI Driver Health Protocols currently present in the EFI Handle Database,
and queries each EFI Driver Health Protocol to determine if one or more of the controllers
managed by each EFI Driver Health Protocol instance are not healthy.
@param DriverHealthList A Pointer to the list contain all of the platform driver health
information.
information.
@retval EFI_NOT_FOUND No controller in the platform install Driver Health Protocol.
@retval EFI_SUCCESS All the controllers in the platform are healthy.
@@ -1772,7 +1772,7 @@ GetAllControllersHealthStatus (
IN OUT LIST_ENTRY *DriverHealthList
)
{
EFI_STATUS Status;
EFI_STATUS Status;
UINTN NumHandles;
EFI_HANDLE *DriverHealthHandles;
EFI_DRIVER_HEALTH_PROTOCOL *DriverHealth;
@@ -1782,7 +1782,7 @@ GetAllControllersHealthStatus (
UINTN HandleCount;
UINTN ControllerIndex;
UINTN ChildIndex;
//
// Initialize local variables
//
@@ -1810,7 +1810,7 @@ GetAllControllersHealthStatus (
if (EFI_ERROR (Status) || DriverHealthHandles == NULL) {
//
// If the list of Driver Health Protocol handles can not be retrieved, then
// If the list of Driver Health Protocol handles can not be retrieved, then
// return EFI_OUT_OF_RESOURCES
//
return EFI_OUT_OF_RESOURCES;
@@ -1831,7 +1831,7 @@ GetAllControllersHealthStatus (
//
// Retrieve the Driver Health Protocol from DriverHandle
//
Status = gBS->HandleProtocol (
Status = gBS->HandleProtocol (
DriverHealthHandles[DriverHealthIndex],
&gEfiDriverHealthProtocolGuid,
(VOID **)&DriverHealth
@@ -1858,7 +1858,7 @@ GetAllControllersHealthStatus (
}
//
// If all the controllers managed by this Driver Health Protocol are healthy, then skip to the next
// If all the controllers managed by this Driver Health Protocol are healthy, then skip to the next
// Driver Health Protocol handle
//
if (HealthStatus == EfiDriverHealthStatusHealthy) {
@@ -1882,7 +1882,7 @@ GetAllControllersHealthStatus (
);
if (EFI_ERROR (Status) || Handles == NULL) {
//
// If all the handles in the handle database can not be retrieved, then
// If all the handles in the handle database can not be retrieved, then
// return EFI_OUT_OF_RESOURCES
//
Status = EFI_OUT_OF_RESOURCES;
@@ -1959,7 +1959,7 @@ Done:
/**
Check the healthy status of the platform, this function will return immediately while found one driver
Check the healthy status of the platform, this function will return immediately while found one driver
in the platform are not healthy.
@retval FALSE at least one driver in the platform are not healthy.
@@ -2002,13 +2002,13 @@ PlaformHealthStatusCheck (
}
//
// Assume all modules are healthy.
//
//
AllHealthy = TRUE;
//
// Found one or more Handles.
//
if (!EFI_ERROR (Status)) {
if (!EFI_ERROR (Status)) {
for (Index = 0; Index < NoHandles; Index++) {
Status = gBS->HandleProtocol (
DriverHealthHandles[Index],
@@ -2033,7 +2033,7 @@ PlaformHealthStatusCheck (
//
// Return immediately one driver's status not in healthy.
//
return FALSE;
return FALSE;
}
}
}
@@ -2042,20 +2042,20 @@ PlaformHealthStatusCheck (
}
/**
Processes a single controller using the EFI Driver Health Protocol associated with
Processes a single controller using the EFI Driver Health Protocol associated with
that controller. This algorithm continues to query the GetHealthStatus() service until
one of the legal terminal states of the EFI Driver Health Protocol is reached. This may
one of the legal terminal states of the EFI Driver Health Protocol is reached. This may
require the processing of HII Messages, HII Form, and invocation of repair operations.
@param DriverHealth A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance.
@param ControllerHandle The class guid specifies which form set will be displayed.
@param ChildHandle The handle of the child controller to retrieve the health
status on. This is an optional parameter that may be NULL.
@param ChildHandle The handle of the child controller to retrieve the health
status on. This is an optional parameter that may be NULL.
@param HealthStatus The health status of the controller.
@param MessageList An array of warning or error messages associated
with the controller specified by ControllerHandle and
@param MessageList An array of warning or error messages associated
with the controller specified by ControllerHandle and
ChildHandle. This is an optional parameter that may be NULL.
@param FormHiiHandle The HII handle for an HII form associated with the
@param FormHiiHandle The HII handle for an HII form associated with the
controller specified by ControllerHandle and ChildHandle.
@param RebootRequired Indicate whether a reboot is required to repair the controller.
**/
@@ -2072,11 +2072,11 @@ ProcessSingleControllerHealth (
{
EFI_STATUS Status;
EFI_DRIVER_HEALTH_STATUS LocalHealthStatus;
LocalHealthStatus = HealthStatus;
//
// If the module need to be repaired or reconfiguration, will process it until
// reach a terminal status. The status from EfiDriverHealthStatusRepairRequired after repair
// reach a terminal status. The status from EfiDriverHealthStatusRepairRequired after repair
// will be in (Health, Failed, Configuration Required).
//
while(LocalHealthStatus == EfiDriverHealthStatusConfigurationRequired ||
@@ -2091,9 +2091,9 @@ ProcessSingleControllerHealth (
);
}
//
// Via a form of the driver need to do configuration provided to process of status in
// Via a form of the driver need to do configuration provided to process of status in
// EfiDriverHealthStatusConfigurationRequired. The status after configuration should be in
// (Healthy, Reboot Required, Failed, Reconnect Required, Repair Required).
// (Healthy, Reboot Required, Failed, Reconnect Required, Repair Required).
//
if (LocalHealthStatus == EfiDriverHealthStatusConfigurationRequired) {
if (FormHiiHandle != NULL) {
@@ -2127,9 +2127,9 @@ ProcessSingleControllerHealth (
if (*MessageList != NULL) {
ProcessMessages (*MessageList);
}
}
}
//
// Health status in {Healthy, Failed} may also have Messages need to process
//
@@ -2144,7 +2144,7 @@ ProcessSingleControllerHealth (
if (LocalHealthStatus == EfiDriverHealthStatusRebootRequired) {
*RebootRequired = TRUE;
}
//
// Do reconnect if need.
//
@@ -2165,11 +2165,11 @@ ProcessSingleControllerHealth (
/**
Reports the progress of a repair operation.
@param[in] Value A value between 0 and Limit that identifies the current
@param[in] Value A value between 0 and Limit that identifies the current
progress of the repair operation.
@param[in] Limit The maximum value of Value for the current repair operation.
For example, a driver that wants to specify progress in
For example, a driver that wants to specify progress in
percent would use a Limit value of 100.
@retval EFI_SUCCESS The progress of a repair operation is reported successfully.
@@ -2197,7 +2197,7 @@ RepairNotify (
Processes a set of messages returned by the GetHealthStatus ()
service of the EFI Driver Health Protocol
@param MessageList The MessageList point to messages need to processed.
@param MessageList The MessageList point to messages need to processed.
**/
VOID
@@ -2219,9 +2219,9 @@ ProcessMessages (
);
if (MessageString != NULL) {
//
// User can customize the output. Just simply print out the MessageString like below.
// User can customize the output. Just simply print out the MessageString like below.
// Also can use the HiiHandle to display message on the front page.
//
//
// Print(L"%s\n",MessageString);
// gBS->Stall (100000);
}
@@ -2233,7 +2233,7 @@ ProcessMessages (
Repair the whole platform.
This function is the main entry for user choose "Repair All" in the front page.
It will try to do recovery job till all the driver health protocol installed modules
It will try to do recovery job till all the driver health protocol installed modules
reach a terminal state.
@param DriverHealthList A Pointer to the list contain all of the platform driver health
@@ -2244,7 +2244,7 @@ VOID
PlatformRepairAll (
IN LIST_ENTRY *DriverHealthList
)
{
{
DRIVER_HEALTH_INFO *DriverHealthInfo;
LIST_ENTRY *Link;
BOOLEAN RebootRequired;
@@ -2263,7 +2263,7 @@ PlatformRepairAll (
//
ASSERT (DriverHealthInfo != NULL);
ProcessSingleControllerHealth (
ProcessSingleControllerHealth (
DriverHealthInfo->DriverHealth,
DriverHealthInfo->ControllerHandle,
DriverHealthInfo->ChildHandle,
@@ -2281,22 +2281,22 @@ PlatformRepairAll (
/**
Select the best matching language according to front page policy for best user experience.
This function supports both ISO 639-2 and RFC 4646 language codes, but language
code types may not be mixed in a single call to this function.
Select the best matching language according to front page policy for best user experience.
This function supports both ISO 639-2 and RFC 4646 language codes, but language
code types may not be mixed in a single call to this function.
@param SupportedLanguages A pointer to a Null-terminated ASCII string that
contains a set of language codes in the format
contains a set of language codes in the format
specified by Iso639Language.
@param Iso639Language If TRUE, then all language codes are assumed to be
in ISO 639-2 format. If FALSE, then all language
codes are assumed to be in RFC 4646 language format.
@retval NULL The best matching language could not be found in SupportedLanguages.
@retval NULL There are not enough resources available to return the best matching
@retval NULL There are not enough resources available to return the best matching
language.
@retval Other A pointer to a Null-terminated ASCII string that is the best matching
@retval Other A pointer to a Null-terminated ASCII string that is the best matching
language in SupportedLanguages.
**/
CHAR8 *
@@ -2334,7 +2334,7 @@ DriverHealthSelectBestLanguage (
@param ProtocolGuid A pointer to an EFI_GUID. It points to Component Name (2) protocol GUID.
@param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved.
@param ComponentName A pointer to the Component Name (2) protocol interface.
@param SupportedLanguage The best suitable language that matches the SupportedLangues interface for the
@param SupportedLanguage The best suitable language that matches the SupportedLangues interface for the
located Component Name (2) instance.
@retval EFI_SUCCESS The Component Name (2) protocol instance is successfully located and we find
@@ -2411,8 +2411,8 @@ GetDriverNameWorker (
EFI_COMPONENT_NAME_PROTOCOL *ComponentName;
//
// Retrieve Component Name (2) protocol instance on the driver binding handle and
// find the best language this instance supports.
// Retrieve Component Name (2) protocol instance on the driver binding handle and
// find the best language this instance supports.
//
Status = GetComponentNameWorker (
ProtocolGuid,
@@ -2423,7 +2423,7 @@ GetDriverNameWorker (
if (EFI_ERROR (Status)) {
return Status;
}
//
// Get the driver name from Component Name (2) protocol instance on the driver binging handle.
//
@@ -2433,7 +2433,7 @@ GetDriverNameWorker (
DriverName
);
FreePool (BestLanguage);
return Status;
}
@@ -2442,7 +2442,7 @@ GetDriverNameWorker (
This function gets driver name from Component Name 2 protocol interface and Component Name protocol interface
in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the driver name.
If the attempt fails, it then gets the driver name from EFI 1.1 Component Name protocol for backward
compatibility support.
compatibility support.
@param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved.
@param DriverName A pointer to the Unicode string to return. This Unicode string is the name
@@ -2483,7 +2483,7 @@ DriverHealthGetDriverName (
This function gets controller name from Component Name 2 protocol interface and Component Name protocol interface
in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name.
If the attempt fails, it then gets the controller name from EFI 1.1 Component Name protocol for backward
compatibility support.
compatibility support.
@param ProtocolGuid A pointer to an EFI_GUID. It points to Component Name (2) protocol GUID.
@param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved.
@@ -2516,8 +2516,8 @@ GetControllerNameWorker (
EFI_COMPONENT_NAME_PROTOCOL *ComponentName;
//
// Retrieve Component Name (2) protocol instance on the driver binding handle and
// find the best language this instance supports.
// Retrieve Component Name (2) protocol instance on the driver binding handle and
// find the best language this instance supports.
//
Status = GetComponentNameWorker (
ProtocolGuid,
@@ -2547,9 +2547,9 @@ GetControllerNameWorker (
/**
This function gets controller name from Component Name 2 protocol interface and Component Name protocol interface
in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name.
in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name.
If the attempt fails, it then gets the controller name from EFI 1.1 Component Name protocol for backward
compatibility support.
compatibility support.
@param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved.
@param ControllerHandle The handle of a controller that the driver specified by This is managing.

70
IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h
View File

@@ -1,7 +1,7 @@
/** @file
The platform device manager reference implement
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -75,7 +75,7 @@ typedef struct {
EFI_DRIVER_HEALTH_PROTOCOL *DriverHealth;
///
/// Driver health messages of the specify Driver
/// Driver health messages of the specify Driver
///
EFI_DRIVER_HEALTH_HII_MESSAGE *MessageList;
@@ -192,7 +192,7 @@ InitializeDeviceManager (
This function create the dynamic content for device manager. It includes
section header for all class of devices, one-of opcode to set VBIOS.
@retval EFI_SUCCESS Operation is successful.
@retval Other values if failed to clean up the dynamic content from HII
database.
@@ -210,11 +210,11 @@ CallDeviceManager (
This function called by CheckAllControllersHealthStatus () function in order to process a specify
contoller's health state.
@param DriverHealthList A Pointer to the list contain all of the platform driver health information.
@param DriverHealthList A Pointer to the list contain all of the platform driver health information.
@param DriverHandle The handle of driver.
@param ControllerHandle The class guid specifies which form set will be displayed.
@param ChildHandle The handle of the child controller to retrieve the health
status on. This is an optional parameter that may be NULL.
@param ChildHandle The handle of the child controller to retrieve the health
status on. This is an optional parameter that may be NULL.
@param DriverHealth A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance.
@param HealthStatus The health status of the controller.
@@ -237,9 +237,9 @@ GetSingleControllerHealthStatus (
);
/**
Collects all the EFI Driver Health Protocols currently present in the EFI Handle Database,
and queries each EFI Driver Health Protocol to determine if one or more of the controllers
managed by each EFI Driver Health Protocol instance are not healthy.
Collects all the EFI Driver Health Protocols currently present in the EFI Handle Database,
and queries each EFI Driver Health Protocol to determine if one or more of the controllers
managed by each EFI Driver Health Protocol instance are not healthy.
@param DriverHealthList A Pointer to the list contain all of the platform driver health
information.
@@ -255,7 +255,7 @@ GetAllControllersHealthStatus (
);
/**
Check the healthy status of the platform, this function will return immediately while found one driver
Check the healthy status of the platform, this function will return immediately while found one driver
in the platform are not healthy.
@retval FALSE at least one driver in the platform are not healthy.
@@ -271,7 +271,7 @@ PlaformHealthStatusCheck (
Repair the whole platform.
This function is the main entry for user choose "Repair All" in the front page.
It will try to do recovery job till all the driver health protocol installed modules
It will try to do recovery job till all the driver health protocol installed modules
reach a terminal state.
@param DriverHealthList A Pointer to the list contain all of the platform driver health
@@ -284,20 +284,20 @@ PlatformRepairAll (
);
/**
Processes a single controller using the EFI Driver Health Protocol associated with
Processes a single controller using the EFI Driver Health Protocol associated with
that controller. This algorithm continues to query the GetHealthStatus() service until
one of the legal terminal states of the EFI Driver Health Protocol is reached. This may
one of the legal terminal states of the EFI Driver Health Protocol is reached. This may
require the processing of HII Messages, HII Form, and invocation of repair operations.
@param DriverHealth A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance.
@param ControllerHandle The class guid specifies which form set will be displayed.
@param ChildHandle The handle of the child controller to retrieve the health
status on. This is an optional parameter that may be NULL.
@param ChildHandle The handle of the child controller to retrieve the health
status on. This is an optional parameter that may be NULL.
@param HealthStatus The health status of the controller.
@param MessageList An array of warning or error messages associated
with the controller specified by ControllerHandle and
@param MessageList An array of warning or error messages associated
with the controller specified by ControllerHandle and
ChildHandle. This is an optional parameter that may be NULL.
@param FormHiiHandle The HII handle for an HII form associated with the
@param FormHiiHandle The HII handle for an HII form associated with the
controller specified by ControllerHandle and ChildHandle.
@param RebootRequired Indicate whether a reboot is required to repair the controller.
**/
@@ -315,11 +315,11 @@ ProcessSingleControllerHealth (
/**
Reports the progress of a repair operation.
@param[in] Value A value between 0 and Limit that identifies the current
@param[in] Value A value between 0 and Limit that identifies the current
progress of the repair operation.
@param[in] Limit The maximum value of Value for the current repair operation.
For example, a driver that wants to specify progress in
For example, a driver that wants to specify progress in
percent would use a Limit value of 100.
@retval EFI_SUCCESS The progress of a repair operation is reported successfully.
@@ -336,7 +336,7 @@ RepairNotify (
Processes a set of messages returned by the GetHealthStatus ()
service of the EFI Driver Health Protocol
@param MessageList The MessageList point to messages need to processed.
@param MessageList The MessageList point to messages need to processed.
**/
VOID
@@ -346,10 +346,10 @@ ProcessMessages (
/**
Collect and display the platform's driver health relative information, allow user to do interactive
Collect and display the platform's driver health relative information, allow user to do interactive
operation while the platform is unhealthy.
This function display a form which divided into two parts. The one list all modules which has installed
This function display a form which divided into two parts. The one list all modules which has installed
driver health protocol. The list usually contain driver name, controller name, and it's health info.
While the driver name can't be retrieved, will use device path as backup. The other part of the form provide
a choice to the user to repair all platform.
@@ -362,22 +362,22 @@ CallDriverHealth (
/**
Select the best matching language according to front page policy for best user experience.
This function supports both ISO 639-2 and RFC 4646 language codes, but language
code types may not be mixed in a single call to this function.
Select the best matching language according to front page policy for best user experience.
This function supports both ISO 639-2 and RFC 4646 language codes, but language
code types may not be mixed in a single call to this function.
@param SupportedLanguages A pointer to a Null-terminated ASCII string that
contains a set of language codes in the format
contains a set of language codes in the format
specified by Iso639Language.
@param Iso639Language If TRUE, then all language codes are assumed to be
in ISO 639-2 format. If FALSE, then all language
codes are assumed to be in RFC 4646 language format.
@retval NULL The best matching language could not be found in SupportedLanguages.
@retval NULL There are not enough resources available to return the best matching
@retval NULL There are not enough resources available to return the best matching
language.
@retval Other A pointer to a Null-terminated ASCII string that is the best matching
@retval Other A pointer to a Null-terminated ASCII string that is the best matching
language in SupportedLanguages.
**/
CHAR8 *
@@ -394,7 +394,7 @@ DriverHealthSelectBestLanguage (
@param ProtocolGuid A pointer to an EFI_GUID. It points to Component Name (2) protocol GUID.
@param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved.
@param ComponentName A pointer to the Component Name (2) protocol interface.
@param SupportedLanguage The best suitable language that matches the SupportedLangues interface for the
@param SupportedLanguage The best suitable language that matches the SupportedLangues interface for the
located Component Name (2) instance.
@retval EFI_SUCCESS The Component Name (2) protocol instance is successfully located and we find
@@ -440,7 +440,7 @@ GetDriverNameWorker (
This function gets driver name from Component Name 2 protocol interface and Component Name protocol interface
in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the driver name.
If the attempt fails, it then gets the driver name from EFI 1.1 Component Name protocol for backward
compatibility support.
compatibility support.
@param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved.
@param DriverName A pointer to the Unicode string to return. This Unicode string is the name
@@ -462,7 +462,7 @@ DriverHealthGetDriverName (
This function gets controller name from Component Name 2 protocol interface and Component Name protocol interface
in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name.
If the attempt fails, it then gets the controller name from EFI 1.1 Component Name protocol for backward
compatibility support.
compatibility support.
@param ProtocolGuid A pointer to an EFI_GUID. It points to Component Name (2) protocol GUID.
@param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved.
@@ -492,9 +492,9 @@ GetControllerNameWorker (
/**
This function gets controller name from Component Name 2 protocol interface and Component Name protocol interface
in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name.
in turn. It first tries UEFI 2.0 Component Name 2 protocol interface and try to get the controller name.
If the attempt fails, it then gets the controller name from EFI 1.1 Component Name protocol for backward
compatibility support.
compatibility support.
@param DriverBindingHandle The handle on which the Component Name (2) protocol instance is retrieved.
@param ControllerHandle The handle of a controller that the driver specified by This is managing.

14
IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerStrings.uni
View File

@@ -1,16 +1,16 @@
///** @file
//
//
// String definitions for the Device Manager.
//
// Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
//
// Copyright (c) 2004 - 2018, 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
// http://opensource.org/licenses/bsd-license.php
//
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
//
//**/
/=#
@@ -49,13 +49,13 @@
#string STR_DH_STATUS_LIST #language en-US "All Driver Health Status List"
#language fr-FR "All Driver Health Status List"
#string STR_DRIVER_HEALTH_REPAIR_ALL #language en-US "Repair All"
#language fr-FR "Repair All"
#language fr-FR "Repair All"
#string STR_DH_REPAIR_ALL_TITLE #language en-US "Repair the whole platform"
#language fr-FR "Repair the whole platform"
#string STR_DH_REPAIR_ALL_HELP #language en-US "Repair the whole platform until all modules reach terminal status"
#language fr-FR "Repair the whole platform until all modules reach terminal status"
#string STR_DH_REPAIR_SINGLE_TITLE #language en-US "Item cannot get name"
#language fr-FR "Item cannot get name"
#language fr-FR "Item cannot get name"
#string STR_DH_REPAIR_SINGLE_HELP #language en-US "Repair single driver with specify controller"
#language fr-FR "Repair single driver with specify controller"

62
IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
View File

@@ -1,7 +1,7 @@
/** @file
FrontPage routines to handle the callbacks and browser calls
Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -189,7 +189,7 @@ FrontPageCallback (
//
return EFI_UNSUPPORTED;
}
gCallbackKey = QuestionId;
if (Action == EFI_BROWSER_ACTION_CHANGED) {
@@ -210,7 +210,7 @@ FrontPageCallback (
// Allocate working buffer for RFC 4646 language in supported LanguageString.
//
Lang = AllocatePool (AsciiStrSize (mLanguageString));
ASSERT (Lang != NULL);
ASSERT (Lang != NULL);
Index = 0;
LangCode = mLanguageString;
@@ -279,7 +279,7 @@ FrontPageCallback (
}
}
return EFI_SUCCESS;
return EFI_SUCCESS;
}
/**
@@ -415,7 +415,7 @@ InitializeFrontPage (
if (gFrontPagePrivate.LanguageToken == NULL) {
//
// Count the language list number.
//
//
LangCode = mLanguageString;
Lang = AllocatePool (AsciiStrSize (mLanguageString));
ASSERT (Lang != NULL);
@@ -739,7 +739,7 @@ UpdateFrontPageStrings (
SMBIOS_TABLE_TYPE19 *Type19Record;
EFI_SMBIOS_TABLE_HEADER *Record;
UINT64 InstalledMemory;
InstalledMemory = 0;
//
@@ -906,7 +906,7 @@ ShowProgress (
SetMem (&Foreground, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);
SetMem (&Background, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0);
SetMem (&Color, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);
TmpStr = GetStringById (STRING_TOKEN (STR_START_BOOT_OPTION));
if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
@@ -917,7 +917,7 @@ ShowProgress (
PlatformBdsShowProgress (Foreground, Background, TmpStr, Color, 0, 0);
}
}
TimeoutRemain = TimeoutDefault;
while (TimeoutRemain != 0) {
@@ -928,7 +928,7 @@ ShowProgress (
break;
}
TimeoutRemain--;
if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
//
// Show progress
@@ -945,7 +945,7 @@ ShowProgress (
}
}
}
if (TmpStr != NULL) {
gBS->FreePool (TmpStr);
}
@@ -997,7 +997,7 @@ PlatformBdsEnterFrontPage (
)
{
EFI_STATUS Status;
EFI_STATUS StatusHotkey;
EFI_STATUS StatusHotkey;
EFI_BOOT_LOGO_PROTOCOL *BootLogo;
EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput;
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *SimpleTextOut;
@@ -1020,7 +1020,7 @@ PlatformBdsEnterFrontPage (
if (!mModeInitialized) {
//
// After the console is ready, get current video resolution
// After the console is ready, get current video resolution
// and text mode before launching setup at first time.
//
Status = gBS->HandleProtocol (
@@ -1031,7 +1031,7 @@ PlatformBdsEnterFrontPage (
if (EFI_ERROR (Status)) {
GraphicsOutput = NULL;
}
Status = gBS->HandleProtocol (
gST->ConsoleOutHandle,
&gEfiSimpleTextOutProtocolGuid,
@@ -1039,7 +1039,7 @@ PlatformBdsEnterFrontPage (
);
if (EFI_ERROR (Status)) {
SimpleTextOut = NULL;
}
}
if (GraphicsOutput != NULL) {
//
@@ -1062,9 +1062,9 @@ PlatformBdsEnterFrontPage (
//
// Get user defined text mode for setup.
//
//
mSetupHorizontalResolution = PcdGet32 (PcdSetupVideoHorizontalResolution);
mSetupVerticalResolution = PcdGet32 (PcdSetupVideoVerticalResolution);
mSetupVerticalResolution = PcdGet32 (PcdSetupVideoVerticalResolution);
mSetupTextModeColumn = PcdGet32 (PcdSetupConOutColumn);
mSetupTextModeRow = PcdGet32 (PcdSetupConOutRow);
@@ -1091,7 +1091,7 @@ PlatformBdsEnterFrontPage (
if (!EFI_ERROR(Status) && ((OsIndication & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) != 0)) {
//
// Clear EFI_OS_INDICATIONS_BOOT_TO_FW_UI to acknowledge OS
//
//
OsIndication &= ~((UINT64)EFI_OS_INDICATIONS_BOOT_TO_FW_UI);
Status = gRT->SetVariable (
L"OsIndications",
@@ -1128,7 +1128,7 @@ PlatformBdsEnterFrontPage (
if (!FeaturePcdGet(PcdBootlogoOnlyEnable) || !EFI_ERROR(Status) || !EFI_ERROR(StatusHotkey)){
//
// Ensure screen is clear when switch Console from Graphics mode to Text mode
// Skip it in normal boot
// Skip it in normal boot
//
gST->ConOut->EnableCursor (gST->ConOut, TRUE);
gST->ConOut->ClearScreen (gST->ConOut);
@@ -1152,8 +1152,8 @@ PlatformBdsEnterFrontPage (
}
//
// Install BM HiiPackages.
// Keep BootMaint HiiPackage, so that it can be covered by global setting.
// Install BM HiiPackages.
// Keep BootMaint HiiPackage, so that it can be covered by global setting.
//
InitBMPackage ();
@@ -1163,7 +1163,7 @@ PlatformBdsEnterFrontPage (
// Set proper video resolution and text mode for setup
//
BdsSetConsoleMode (TRUE);
InitializeFrontPage (FALSE);
//
@@ -1272,9 +1272,9 @@ Exit:
/**
This function will change video resolution and text mode
according to defined setup mode or defined boot mode
according to defined setup mode or defined boot mode
@param IsSetupMode Indicate mode is changed to setup mode or boot mode.
@param IsSetupMode Indicate mode is changed to setup mode or boot mode.
@retval EFI_SUCCESS Mode is changed successfully.
@retval Others Mode failed to be changed.
@@ -1302,13 +1302,13 @@ BdsSetConsoleMode (
EFI_STATUS Status;
UINTN Index;
UINTN CurrentColumn;
UINTN CurrentRow;
UINTN CurrentRow;
MaxGopMode = 0;
MaxTextMode = 0;
//
// Get current video resolution and text mode
// Get current video resolution and text mode
//
Status = gBS->HandleProtocol (
gST->ConsoleOutHandle,
@@ -1326,7 +1326,7 @@ BdsSetConsoleMode (
);
if (EFI_ERROR (Status)) {
SimpleTextOut = NULL;
}
}
if ((GraphicsOutput == NULL) || (SimpleTextOut == NULL)) {
return EFI_UNSUPPORTED;
@@ -1347,12 +1347,12 @@ BdsSetConsoleMode (
NewHorizontalResolution = mBootHorizontalResolution;
NewVerticalResolution = mBootVerticalResolution;
NewColumns = mBootTextModeColumn;
NewRows = mBootTextModeRow;
NewRows = mBootTextModeRow;
}
if (GraphicsOutput != NULL) {
MaxGopMode = GraphicsOutput->Mode->MaxMode;
}
}
if (SimpleTextOut != NULL) {
MaxTextMode = SimpleTextOut->Mode->MaxMode;
@@ -1456,8 +1456,8 @@ BdsSetConsoleMode (
ASSERT_EFI_ERROR (Status);
Status = PcdSet32S (PcdConOutRow, NewRows);
ASSERT_EFI_ERROR (Status);
//
// Video mode is changed, so restart graphics console driver and higher level driver.
// Reconnect graphics console driver and higher level driver.

6
IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h
View File

@@ -1,7 +1,7 @@
/** @file
FrontPage routines to handle the callbacks and browser calls
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -236,9 +236,9 @@ PlatformBdsEnterFrontPage (
/**
This function will change video resolution and text mode
according to defined setup mode or defined boot mode
according to defined setup mode or defined boot mode
@param IsSetupMode Indicate mode is changed to setup mode or boot mode.
@param IsSetupMode Indicate mode is changed to setup mode or boot mode.
@retval EFI_SUCCESS Mode is changed successfully.
@retval Others Mode failed to be changed.

10
IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageStrings.uni
View File

@@ -1,16 +1,16 @@
///** @file
//
//
// String definitions for BdsPlatform formset.
//
// Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
//
// Copyright (c) 2004 - 2018, 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
// http://opensource.org/licenses/bsd-license.php
//
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
//
//**/
/=#

12
IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
View File

@@ -2,7 +2,7 @@
Provides a way for 3rd party applications to register themselves for launch by the
Boot Manager based on hot key
Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2007 - 2018, 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
@@ -73,15 +73,15 @@ EFI_STATUS
HotkeyBoot (
VOID
)
{
{
EFI_STATUS Status;
UINTN ExitDataSize;
CHAR16 *ExitData;
if (mHotkeyBootOption == NULL) {
return EFI_NOT_FOUND;
}
}
BdsLibConnectDevicePath (mHotkeyBootOption->DevicePath);
//
@@ -162,7 +162,7 @@ HotkeyCallback (
HotkeyData = &Hotkey->KeyData[Hotkey->WaitingKey];
if ((KeyData->Key.ScanCode == HotkeyData->Key.ScanCode) &&
(KeyData->Key.UnicodeChar == HotkeyData->Key.UnicodeChar) &&
(((KeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) ?
(((KeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) ?
(KeyData->KeyState.KeyShiftState == HotkeyData->KeyState.KeyShiftState) : TRUE
)
) {
@@ -421,7 +421,7 @@ IsKeyOptionVariable (
)
{
UINTN Index;
if (!CompareGuid (Guid, &gEfiGlobalVariableGuid) ||
(StrSize (Name) != sizeof (L"Key####")) ||
(StrnCmp (Name, L"Key", 3) != 0)

6
IntelFrameworkModulePkg/Universal/BdsDxe/HwErrRecSupport.c
View File

@@ -2,7 +2,7 @@
Set the level of support for Hardware Error Record Persistence that is
implemented by the platform.
Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2007 - 2018, 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
@@ -28,9 +28,9 @@ InitializeHwErrRecSupport (
{
EFI_STATUS Status;
UINT16 HardwareErrorRecordLevel;
HardwareErrorRecordLevel = PcdGet16 (PcdHardwareErrorRecordLevel);
if (HardwareErrorRecordLevel != 0) {
//
// If level value equal 0, no need set to 0 to variable area because UEFI specification

10
IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
View File

@@ -1,7 +1,7 @@
/** @file
Language settings
Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -343,7 +343,7 @@ IsLangInSupportedLangCodes(
IN CHAR8 *SupportedLang,
IN CHAR8 *Lang,
IN BOOLEAN Iso639Language
)
)
{
UINTN Index;
UINTN CompareLength;
@@ -375,8 +375,8 @@ IsLangInSupportedLangCodes(
// Determine the length of the next language code in SupportedLang
//
for (CompareLength = 0; SupportedLang[CompareLength] != '\0' && SupportedLang[CompareLength] != ';'; CompareLength++);
if ((CompareLength == LanguageLength) &&
if ((CompareLength == LanguageLength) &&
(AsciiStrnCmp (Lang, SupportedLang, CompareLength) == 0)) {
//
// Successfully find the Lang string in SupportedLang string.
@@ -404,7 +404,7 @@ VOID
InitializeLangVariable (
IN CHAR16 *LangName,
IN CHAR8 *SupportedLang,
IN CHAR8 *DefaultLang,
IN CHAR8 *DefaultLang,
IN BOOLEAN Iso639Language
)
{

12
IntelFrameworkModulePkg/Universal/BdsDxe/MemoryTest.c
View File

@@ -1,7 +1,7 @@
/** @file
Perform the platform memory test
Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2018, 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
@@ -282,7 +282,7 @@ BdsMemoryTest (
FreePool (Pos);
return EFI_SUCCESS;
}
if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
TmpStr = GetStringById (STRING_TOKEN (STR_ESC_TO_SKIP_MEM_TEST));
@@ -310,7 +310,7 @@ BdsMemoryTest (
ASSERT (0);
}
if (!FeaturePcdGet(PcdBootlogoOnlyEnable)) {
TempData = (UINT32) DivU64x32 (TotalMemorySize, 16);
TestPercent = (UINTN) DivU64x32 (
@@ -326,7 +326,7 @@ BdsMemoryTest (
//
StrnCatS (
StrPercent,
sizeof (StrPercent) / sizeof (CHAR16),
sizeof (StrPercent) / sizeof (CHAR16),
TmpStr,
sizeof (StrPercent) / sizeof (CHAR16) - StrLen (StrPercent) - 1
);
@@ -412,11 +412,11 @@ Done:
100,
(UINTN) PreviousValue
);
} else {
DEBUG ((EFI_D_INFO, "%d bytes of system memory tested OK\r\n", TotalMemorySize));
}
FreePool (Pos);

12
IntelFrameworkModulePkg/Universal/BdsDxe/Strings.uni
View File

@@ -1,16 +1,16 @@
///** @file
//
//
// String definitions for BdsPlatform formset.
//
// Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
//
// Copyright (c) 2004 - 2018, 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
// http://opensource.org/licenses/bsd-license.php
//
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
//
//**/
/=#
@@ -52,4 +52,4 @@
#language fr-FR "le Système rencontre les erreurs de mémoire"
#string STR_START_BOOT_OPTION #language en-US "Start boot option"
#language fr-FR "l'option de botte de Début"