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

ShellPkg: Add '-nc' flag support in 'disconnect' command

Browse Source 
As per ECR 1416, latest UEFI Shell 2.2 specification:
Define a behavior where 'disconnect -r' will disconnect drivers
from all devices but it will reconnect all consoles.
If -nc flag is used (e.g. 'disconnect -r -nc') then disconnect drivers
from all devices and don't reconnect consoles.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tapan Shah <tapandshah@hpe.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Tapan Shah
2016-09-22 12:49:12 -07:00
committed by Jaben Carsey
parent 7f1bf51bdb
commit 339a2b935e
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
View File

@ -1,6 +1,7 @@
/** @file
Main file for Disconnect shell Driver1 function.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
@ -17,6 +18,7 @@
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
{L"-r", TypeFlag},
{L"-nc", TypeFlag},
{NULL, TypeMax}
};
@ -132,8 +134,22 @@ ShellCommandRunDisconnect (
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
Status = DisconnectAll();
Status = DisconnectAll ();
//
// Reconnect all consoles if -nc is not provided
//
if (!ShellCommandLineGetFlag (Package, L"-nc")){
ShellConnectFromDevPaths (L"ConInDev");
ShellConnectFromDevPaths (L"ConOutDev");
ShellConnectFromDevPaths (L"ErrOutDev");
ShellConnectFromDevPaths (L"ErrOut");
ShellConnectFromDevPaths (L"ConIn");
ShellConnectFromDevPaths (L"ConOut");
}
}
} else if (ShellCommandLineGetFlag (Package, L"-nc")) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");
ShellStatus = SHELL_INVALID_PARAMETER;
} else {
if (ShellCommandLineGetCount(Package) > 4){
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"disconnect");