tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats 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 /** @file
Main file for Disconnect shell Driver1 function. 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> (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
Copyright (c) 2010 - 2012, 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
@ -17,6 +18,7 @@
STATIC CONST SHELL_PARAM_ITEM ParamList[] = { STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
{L"-r", TypeFlag}, {L"-r", TypeFlag},
{L"-nc", TypeFlag},
{NULL, TypeMax} {NULL, TypeMax}
}; };
@ -132,8 +134,22 @@ ShellCommandRunDisconnect (
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect"); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"disconnect");
ShellStatus = SHELL_INVALID_PARAMETER; ShellStatus = SHELL_INVALID_PARAMETER;
} else { } 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 { } else {
if (ShellCommandLineGetCount(Package) > 4){ if (ShellCommandLineGetCount(Package) > 4){
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"disconnect"); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"disconnect");

14
ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.uni
View File

@ -1,5 +1,6 @@
// /** // /**
// //
// (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
// (C) Copyright 2012-2015 Hewlett-Packard Development Company, L.P.<BR> // (C) Copyright 2012-2015 Hewlett-Packard Development Company, L.P.<BR>
// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR> // Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
// This program and the accompanying materials // This program and the accompanying materials
@ -299,11 +300,14 @@
"Disconnects one or more drivers from the specified devices. \r\n" "Disconnects one or more drivers from the specified devices. \r\n"
".SH SYNOPSIS\r\n" ".SH SYNOPSIS\r\n"
" \r\n" " \r\n"
"DISCONNECT DeviceHandle [DriverHandle [ChildHandle]] [-r] \r\n" "DISCONNECT DeviceHandle [DriverHandle [ChildHandle]] \r\n"
"DISCONNECT [-r] [-nc] \r\n"
".SH OPTIONS\r\n" ".SH OPTIONS\r\n"
" \r\n" " \r\n"
"NOTES:\r\n" "NOTES:\r\n"
" -r - Disconnects all drivers from all devices.\r\n" " -r - Disconnects all drivers from all devices, then reconnect\r\n"
" consoles.\r\n"
" -nc - Do not reconnect the console devices.\r\n"
" DeviceHandle - Specifies a device handle (a hexadecimal number). If not specified, then\r\n" " DeviceHandle - Specifies a device handle (a hexadecimal number). If not specified, then\r\n"
" disconnect DriverHandle.\r\n" " disconnect DriverHandle.\r\n"
" DriverHandle - Specifies a driver handle (a hexadecimal number).\r\n" " DriverHandle - Specifies a driver handle (a hexadecimal number).\r\n"
@ -324,9 +328,13 @@
".SH EXAMPLES\r\n" ".SH EXAMPLES\r\n"
" \r\n" " \r\n"
"EXAMPLES:\r\n" "EXAMPLES:\r\n"
" * To disconnect all drivers from all devices:\r\n" " * To disconnect all drivers from all devices, then reconnect console\r\n"
" devices:\r\n"
" Shell> disconnect -r\r\n" " Shell> disconnect -r\r\n"
" \r\n" " \r\n"
" * To disconnect all drivers from all devices, including console devices:\r\n"
" Shell> disconnect -r -nc\r\n"
" \r\n"
" * To disconnect all drivers from device 0x28:\r\n" " * To disconnect all drivers from device 0x28:\r\n"
" fs0:\> disconnect 28\r\n" " fs0:\> disconnect 28\r\n"
" \r\n" " \r\n"