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

ShellPkg: Connect all the consoles in "reconnect -r".

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16473 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Qiu Shumin
2014-12-04 01:18:04 +00:00
committed by shenshushi
parent 8f586b85c3
commit d86b04fbe9
3 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,8 @@ ShellConnectPciRootBridge (
for (RootBridgeIndex = 0; RootBridgeIndex < RootBridgeHandleCount; RootBridgeIndex++) {
gBS->ConnectController (RootBridgeHandleBuffer[RootBridgeIndex], NULL, NULL, FALSE);
}
FreePool (RootBridgeHandleBuffer);
return EFI_SUCCESS;
}
@ -192,7 +194,7 @@ ConnectControllers (
**/
EFI_STATUS
EFIAPI
ConnectFromDevPaths (
ShellConnectFromDevPaths (
IN CONST CHAR16 *Key
)
{
@ -462,31 +464,31 @@ ShellCommandRunConnect (
// do the conin and conout from EFI variables
// if the first fails dont 'loose' the error
//
Status = ConnectFromDevPaths(L"ConInDev");
Status = ShellConnectFromDevPaths(L"ConInDev");
if (EFI_ERROR(Status)) {
ConnectFromDevPaths(L"ConOutDev");
ShellConnectFromDevPaths(L"ConOutDev");
} else {
Status = ConnectFromDevPaths(L"ConOutDev");
Status = ShellConnectFromDevPaths(L"ConOutDev");
}
if (EFI_ERROR(Status)) {
ConnectFromDevPaths(L"ErrOutDev");
ShellConnectFromDevPaths(L"ErrOutDev");
} else {
Status = ConnectFromDevPaths(L"ErrOutDev");
Status = ShellConnectFromDevPaths(L"ErrOutDev");
}
if (EFI_ERROR(Status)) {
ConnectFromDevPaths(L"ErrOut");
ShellConnectFromDevPaths(L"ErrOut");
} else {
Status = ConnectFromDevPaths(L"ErrOut");
Status = ShellConnectFromDevPaths(L"ErrOut");
}
if (EFI_ERROR(Status)) {
ConnectFromDevPaths(L"ConIn");
ShellConnectFromDevPaths(L"ConIn");
} else {
Status = ConnectFromDevPaths(L"ConIn");
Status = ShellConnectFromDevPaths(L"ConIn");
}
if (EFI_ERROR(Status)) {
ConnectFromDevPaths(L"ConOut");
ShellConnectFromDevPaths(L"ConOut");
} else {
Status = ConnectFromDevPaths(L"ConOut");
Status = ShellConnectFromDevPaths(L"ConOut");
}
if (EFI_ERROR(Status)) {
ShellStatus = SHELL_DEVICE_ERROR;