OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove global variable in boot cmd 

The 'boot' command is making use of a global
variable declared in the OS Loader but it might
not always be available if the Shell lib is
used with other code. This patch removes the
dependency on the global variable.

Also fixes a small issue with not providing a
value at the prompt; instead prompt the user
with a error message when no valid value has
been provided.

Signed-off-by: James Gutbub <james.gutbub@intel.com>
This commit is contained in:
James Gutbub 2019-10-23 18:21:28 -07:00 committed by James Gutbub
parent 28c0039763
commit 4d7a8b58cf
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BootloaderCommonPkg/Library/ShellLib/CmdBoot.c
View File

@ -17,8 +17,6 @@
#include <Guid/OsBootOptionGuid.h>
#include "Shell.h"
extern UINT8 mCurrentBoot;
/**
Print or modify the OS boot option list.
@ -369,7 +367,7 @@ PrintBootOption (
);
}
if (Index == mCurrentBoot) {
if (Index == OsBootOptionList->CurrentBoot) {
ShellPrint (L" *Current");
}
ShellPrint (L"\n");
@ -486,7 +484,7 @@ ShellCommandBootFunc (
goto ExitBootCmd;
} else {
Index = (UINT16)StrHexToUintn (Buffer);
if (Index < BootOptionList->OsBootOptionCount) {
if ((StrLen (Buffer) > 0) && (Index < BootOptionList->OsBootOptionCount)) {
break;
}
ShellPrint (L"Invalid value '%s', please re-enter\n", Buffer);
@ -503,7 +501,7 @@ ShellCommandBootFunc (
ShellPrint (L"Enter index to change to (0 to %u)\n",
BootOptionList->OsBootOptionCount - 1
);
ShellPrint (L"(current index %u) ", mCurrentBoot);
ShellPrint (L"(current index %u) ", BootOptionList->CurrentBoot);
Status = ShellReadUintn (Shell, Buffer, sizeof (Buffer), &IsHex);
if (EFI_ERROR (Status)) {
return Status;
@ -512,7 +510,8 @@ ShellCommandBootFunc (
if (StrLen (Buffer) == 0) {
break;
} else if (Index < BootOptionList->OsBootOptionCount) {
mCurrentBoot = (UINT8) Index;
BootOptionList->CurrentBoot = (UINT8) Index;
BootOptionList->BootOptionReset = 0x1;
break;
}
ShellPrint (L"Invalid index '%s', please re-enter\n", Buffer);