diff options
Diffstat (limited to 'edk2/ShellPkg/Library/UefiShellDriver1CommandsLib')
| -rw-r--r-- | edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c | 14 | ||||
| -rw-r--r-- | edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c | 26 | ||||
| -rw-r--r-- | edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c | 2 | ||||
| -rw-r--r-- | edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni | bin | 69952 -> 70094 bytes |
4 files changed, 20 insertions, 22 deletions
diff --git a/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c b/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c index 429964d8c..56a110b65 100644 --- a/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c +++ b/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c @@ -1,7 +1,7 @@ /** @file
Main file for connect shell Driver1 function.
- Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2012, 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
@@ -149,9 +149,9 @@ ConnectFromDevPaths ( Status = ConnectControllers(NULL, Handle, FALSE, TRUE, FALSE);
}
} else if ((StrCmp(Key, L"ConOutDev") == 0)
- || (StrCmp(Key, L"ConErrDev") == 0)
+ || (StrCmp(Key, L"ErrOutDev") == 0)
|| (StrCmp(Key, L"ConOut") == 0)
- || (StrCmp(Key, L"ConErr") == 0)
+ || (StrCmp(Key, L"ErrOut") == 0)
){
Status = gBS->LocateDevicePath((EFI_GUID*)&gEfiConsoleOutDeviceGuid, &DevPathWalker, &Handle);
if (!EFI_ERROR(Status)) {
@@ -299,14 +299,14 @@ ShellCommandRunConnect ( Status = ConnectFromDevPaths(L"ConOutDev");
}
if (EFI_ERROR(Status)) {
- ConnectFromDevPaths(L"ConErrDev");
+ ConnectFromDevPaths(L"ErrOutDev");
} else {
- Status = ConnectFromDevPaths(L"ConErrDev");
+ Status = ConnectFromDevPaths(L"ErrOutDev");
}
if (EFI_ERROR(Status)) {
- ConnectFromDevPaths(L"ConErr");
+ ConnectFromDevPaths(L"ErrOut");
} else {
- Status = ConnectFromDevPaths(L"ConErr");
+ Status = ConnectFromDevPaths(L"ErrOut");
}
if (EFI_ERROR(Status)) {
ConnectFromDevPaths(L"ConIn");
diff --git a/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c b/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c index 18912e8f0..1f7675b8b 100644 --- a/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c +++ b/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c @@ -221,19 +221,17 @@ ShellCommandRunDrivers ( ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
- Lang = ShellCommandLineGetValue(Package, L"-l");
- if (Lang != NULL) {
- Language = AllocateZeroPool(StrSize(Lang));
- AsciiSPrint(Language, StrSize(Lang), "%S", Lang);
- } else if (!ShellCommandLineGetFlag(Package, L"-l")){
- ASSERT(Language == NULL);
- // Language = AllocateZeroPool(10);
- // AsciiSPrint(Language, 10, "en-us");
- } else {
- ASSERT(Language == NULL);
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");
- ShellCommandLineFreeVarList (Package);
- return (SHELL_INVALID_PARAMETER);
+ if (ShellCommandLineGetFlag(Package, L"-l")){
+ Lang = ShellCommandLineGetValue(Package, L"-l");
+ if (Lang != NULL) {
+ Language = AllocateZeroPool(StrSize(Lang));
+ AsciiSPrint(Language, StrSize(Lang), "%S", Lang);
+ } else {
+ ASSERT(Language == NULL);
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"-l");
+ ShellCommandLineFreeVarList (Package);
+ return (SHELL_INVALID_PARAMETER);
+ }
}
if (ShellCommandLineGetFlag(Package, L"-sfo")) {
@@ -261,7 +259,7 @@ ShellCommandRunDrivers ( DriverVersion = ReturnDriverVersion(*HandleWalker);
DriverConfig = ReturnDriverConfig(*HandleWalker);
DriverDiag = ReturnDriverDiag (*HandleWalker);
- Lang = GetStringNameFromHandle(*HandleWalker, Language==NULL?"en":Language);
+ Lang = GetStringNameFromHandle(*HandleWalker, Language);
ShellPrintEx(
-1,
diff --git a/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c b/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c index 0cb784039..368948307 100644 --- a/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c +++ b/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c @@ -99,7 +99,7 @@ TraverseHandleDatabase ( default: OpenTypeString = StringUnknown; break;
}
HandleIndex = ConvertHandleToHandleIndex(OpenInfo[OpenInfoIndex].AgentHandle);
- Name = GetStringNameFromHandle(OpenInfo[OpenInfoIndex].AgentHandle, "en");
+ Name = GetStringNameFromHandle(OpenInfo[OpenInfoIndex].AgentHandle, NULL);
if (OpenInfo[OpenInfoIndex].ControllerHandle!=NULL) {
ShellPrintHiiEx(
-1,
diff --git a/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni b/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni Binary files differindex c54ce34a2..6c669795a 100644 --- a/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni +++ b/edk2/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni |