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>

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

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