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

Update the "ConErr" related variable name to the new one "ErrOut".

Browse Source 
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13641 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10
2012-08-17 03:58:17 +00:00
parent f4a25e813f
commit 4ccd9214a4
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ShellPkg/Application/Shell/ShellParametersProtocol.c
View File

@ -609,8 +609,8 @@ UpdateStdInStdOutStdErr(
SystemTableInfo->ConInHandle = gST->ConsoleInHandle; SystemTableInfo->ConInHandle = gST->ConsoleInHandle;
SystemTableInfo->ConOut = gST->ConOut; SystemTableInfo->ConOut = gST->ConOut;
SystemTableInfo->ConOutHandle = gST->ConsoleOutHandle; SystemTableInfo->ConOutHandle = gST->ConsoleOutHandle;
SystemTableInfo->ConErr = gST->StdErr; SystemTableInfo->ErrOut = gST->StdErr;
SystemTableInfo->ConErrHandle = gST->StandardErrorHandle; SystemTableInfo->ErrOutHandle = gST->StandardErrorHandle;
*OldStdIn = ShellParameters->StdIn; *OldStdIn = ShellParameters->StdIn;
*OldStdOut = ShellParameters->StdOut; *OldStdOut = ShellParameters->StdOut;
*OldStdErr = ShellParameters->StdErr; *OldStdErr = ShellParameters->StdErr;
@ -1200,10 +1200,10 @@ RestoreStdInStdOutStdErr (
gST->ConOut = SystemTableInfo->ConOut; gST->ConOut = SystemTableInfo->ConOut;
gST->ConsoleOutHandle = SystemTableInfo->ConOutHandle; gST->ConsoleOutHandle = SystemTableInfo->ConOutHandle;
} }
if (gST->StdErr != SystemTableInfo->ConErr) { if (gST->StdErr != SystemTableInfo->ErrOut) {
CloseSimpleTextOutOnFile(gST->StdErr); CloseSimpleTextOutOnFile(gST->StdErr);
gST->StdErr = SystemTableInfo->ConErr; gST->StdErr = SystemTableInfo->ErrOut;
gST->StandardErrorHandle = SystemTableInfo->ConErrHandle; gST->StandardErrorHandle = SystemTableInfo->ErrOutHandle;
} }
CalculateEfiHdrCrc(&gST->Hdr); CalculateEfiHdrCrc(&gST->Hdr);

6
ShellPkg/Application/Shell/ShellParametersProtocol.h
View File

@ -2,7 +2,7 @@
Member functions of EFI_SHELL_PARAMETERS_PROTOCOL and functions for creation, Member functions of EFI_SHELL_PARAMETERS_PROTOCOL and functions for creation,
manipulation, and initialization of EFI_SHELL_PARAMETERS_PROTOCOL. manipulation, and initialization of EFI_SHELL_PARAMETERS_PROTOCOL.
Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2012, 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
@ -123,8 +123,8 @@ typedef struct {
EFI_HANDLE ConInHandle; EFI_HANDLE ConInHandle;
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *ConOut; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *ConOut;
EFI_HANDLE ConOutHandle; EFI_HANDLE ConOutHandle;
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *ConErr; EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *ErrOut;
EFI_HANDLE ConErrHandle; EFI_HANDLE ErrOutHandle;
} SYSTEM_TABLE_INFO; } SYSTEM_TABLE_INFO;
/** /**

14
ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Main file for connect shell Driver1 function. 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 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
@ -149,9 +149,9 @@ ConnectFromDevPaths (
Status = ConnectControllers(NULL, Handle, FALSE, TRUE, FALSE); Status = ConnectControllers(NULL, Handle, FALSE, TRUE, FALSE);
} }
} else if ((StrCmp(Key, L"ConOutDev") == 0) } 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"ConOut") == 0)
|| (StrCmp(Key, L"ConErr") == 0) || (StrCmp(Key, L"ErrOut") == 0)
){ ){
Status = gBS->LocateDevicePath((EFI_GUID*)&gEfiConsoleOutDeviceGuid, &DevPathWalker, &Handle); Status = gBS->LocateDevicePath((EFI_GUID*)&gEfiConsoleOutDeviceGuid, &DevPathWalker, &Handle);
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status)) {
@ -299,14 +299,14 @@ ShellCommandRunConnect (
Status = ConnectFromDevPaths(L"ConOutDev"); Status = ConnectFromDevPaths(L"ConOutDev");
} }
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
ConnectFromDevPaths(L"ConErrDev"); ConnectFromDevPaths(L"ErrOutDev");
} else { } else {
Status = ConnectFromDevPaths(L"ConErrDev"); Status = ConnectFromDevPaths(L"ErrOutDev");
} }
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
ConnectFromDevPaths(L"ConErr"); ConnectFromDevPaths(L"ErrOut");
} else { } else {
Status = ConnectFromDevPaths(L"ConErr"); Status = ConnectFromDevPaths(L"ErrOut");
} }
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
ConnectFromDevPaths(L"ConIn"); ConnectFromDevPaths(L"ConIn");