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

ShellPkg/reset: Support "-fwui" flag

Browse Source 
The patch adds "-fwui" support to reset command which is newly added
to Shell 2.2 spec.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Chen A Chen
2016-11-03 15:20:48 +08:00
committed by Ruiyu Ni
parent 3b25ca839b
commit f675a1b422
2 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ShellPkg/Library/UefiShellLevel2CommandsLib/Reset.c
View File

@ -2,7 +2,7 @@
Main file for attrib shell level 2 function. Main file for attrib shell level 2 function.
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR> (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -19,7 +19,8 @@ STATIC CONST SHELL_PARAM_ITEM ResetParamList[] = {
{L"-w", TypeValue}, {L"-w", TypeValue},
{L"-s", TypeValue}, {L"-s", TypeValue},
{L"-c", TypeValue}, {L"-c", TypeValue},
{NULL, TypeMax} {L"-fwui", TypeFlag },
{NULL, TypeMax }
}; };
/** /**
@ -40,6 +41,9 @@ ShellCommandRunReset (
CONST CHAR16 *String; CONST CHAR16 *String;
CHAR16 *ProblemParam; CHAR16 *ProblemParam;
SHELL_STATUS ShellStatus; SHELL_STATUS ShellStatus;
UINT64 OsIndications;
UINT32 Attr;
UINTN DataSize;
ShellStatus = SHELL_SUCCESS; ShellStatus = SHELL_SUCCESS;
ProblemParam = NULL; ProblemParam = NULL;
@ -72,6 +76,39 @@ ShellCommandRunReset (
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"reset"); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel2HiiHandle, L"reset");
ShellStatus = SHELL_INVALID_PARAMETER; ShellStatus = SHELL_INVALID_PARAMETER;
} else { } else {
if (ShellCommandLineGetFlag (Package, L"-fwui")) {
DataSize = sizeof (OsIndications);
Status = gRT->GetVariable (
EFI_OS_INDICATIONS_SUPPORT_VARIABLE_NAME, &gEfiGlobalVariableGuid,
&Attr, &DataSize, &OsIndications
);
if (!EFI_ERROR (Status)) {
if ((OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) != 0) {
DataSize = sizeof (OsIndications);
Status = gRT->GetVariable (
EFI_OS_INDICATIONS_VARIABLE_NAME, &gEfiGlobalVariableGuid,
&Attr, &DataSize, &OsIndications
);
if (!EFI_ERROR (Status)) {
OsIndications |= EFI_OS_INDICATIONS_BOOT_TO_FW_UI;
} else {
OsIndications = EFI_OS_INDICATIONS_BOOT_TO_FW_UI;
}
Status = gRT->SetVariable (
EFI_OS_INDICATIONS_VARIABLE_NAME, &gEfiGlobalVariableGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
sizeof (OsIndications), &OsIndications
);
}
}
if (EFI_ERROR (Status)) {
ShellStatus = SHELL_UNSUPPORTED;
goto Error;
}
}
// //
// check for warm reset flag, then shutdown reset flag, then cold (default) reset flag // check for warm reset flag, then shutdown reset flag, then cold (default) reset flag
// //
@ -119,6 +156,7 @@ ShellCommandRunReset (
// as the ResetSystem function should not return... // as the ResetSystem function should not return...
// //
Error:
// //
// free the command line package // free the command line package
// //

1
ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h
View File

@ -25,6 +25,7 @@
#include <Uefi.h> #include <Uefi.h>
#include <Guid/GlobalVariable.h>
#include <Guid/ShellLibHiiGuid.h> #include <Guid/ShellLibHiiGuid.h>
#include <Protocol/Shell.h> #include <Protocol/Shell.h>