From 339a2b935e7dd40525e8d71f1b80b8ba1be83215 Mon Sep 17 00:00:00 2001 From: Tapan Shah Date: Thu, 22 Sep 2016 12:49:12 -0700 Subject: 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 Reviewed-by: Jaben Carsey --- .../Library/UefiShellDriver1CommandsLib/Disconnect.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c') diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c index 9afbf07329..adca80ed61 100644 --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c @@ -1,6 +1,7 @@ /** @file Main file for Disconnect shell Driver1 function. + (C) Copyright 2016 Hewlett Packard Enterprise Development LP
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
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"); -- cgit v1.2.3