ShellPkg/dh: Display the protocol instance pointer value for "-v"

[mirror_edk2.git] / ShellPkg / Library / UefiShellDriver1CommandsLib / Connect.c

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
index 11b8e91bc5cd2ebf89e0d9baeaa0f5ae47d639f0..dd868a7016af2287a743e015b196edf4e191c647 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
@@ -1,7 +1,8 @@
 /** @file\r
   Main file for connect shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -93,6 +94,8 @@ ShellConnectPciRootBridge (
   for (RootBridgeIndex = 0; RootBridgeIndex < RootBridgeHandleCount; RootBridgeIndex++) {    \r
     gBS->ConnectController (RootBridgeHandleBuffer[RootBridgeIndex], NULL, NULL, FALSE);    \r
   }  \r
+\r
+  FreePool (RootBridgeHandleBuffer);\r
   \r
   return EFI_SUCCESS;\r
 }\r
@@ -110,7 +113,6 @@ ShellConnectPciRootBridge (
   @retval EFI_SUCCESS             The operation was successful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConnectControllers (\r
   IN CONST EFI_HANDLE ControllerHandle OPTIONAL,\r
   IN CONST EFI_HANDLE DriverHandle OPTIONAL,\r
@@ -191,8 +193,7 @@ ConnectControllers (
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
-ConnectFromDevPaths (\r
+ShellConnectFromDevPaths (\r
   IN CONST CHAR16 *Key\r
   )\r
 {\r
@@ -350,7 +351,6 @@ ConnectFromDevPaths (
   @retval EFI_SUCCESS           The operation was successful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConvertAndConnectControllers (\r
   IN EFI_HANDLE     *Handle1 OPTIONAL,\r
   IN EFI_HANDLE     *Handle2 OPTIONAL,\r
@@ -437,7 +437,7 @@ ShellCommandRunConnect (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
   if (EFI_ERROR(Status)) {\r
     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, ProblemParam);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"connect", ProblemParam);  \r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
@@ -449,44 +449,45 @@ ShellCommandRunConnect (
     //\r
     Count = (gInReconnect?0x4:0x3);\r
     if ((ShellCommandLineGetCount(Package) > Count)\r
-      ||((ShellCommandLineGetFlag(Package, L"-r") || ShellCommandLineGetFlag(Package, L"-c")) && ShellCommandLineGetCount(Package)>1)\r
+      ||(ShellCommandLineGetFlag(Package, L"-c") && ShellCommandLineGetCount(Package)>1)\r
+      ||(ShellCommandLineGetFlag(Package, L"-r") && ShellCommandLineGetCount(Package)>2)\r
       ||(ShellCommandLineGetFlag(Package, L"-r") && ShellCommandLineGetFlag(Package, L"-c") )\r
-     ){\r
+    ){\r
       //\r
       // error for too many parameters\r
       //\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle);\r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"connect");  \r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else if (ShellCommandLineGetFlag(Package, L"-c")) {\r
       //\r
       // do the conin and conout from EFI variables\r
       // if the first fails dont 'loose' the error\r
       //\r
-      Status = ConnectFromDevPaths(L"ConInDev");\r
+      Status = ShellConnectFromDevPaths(L"ConInDev");\r
       if (EFI_ERROR(Status)) {\r
-        ConnectFromDevPaths(L"ConOutDev");\r
+        ShellConnectFromDevPaths(L"ConOutDev");\r
       } else {\r
-        Status = ConnectFromDevPaths(L"ConOutDev");\r
+        Status = ShellConnectFromDevPaths(L"ConOutDev");\r
       }\r
       if (EFI_ERROR(Status)) {\r
-        ConnectFromDevPaths(L"ErrOutDev");\r
+        ShellConnectFromDevPaths(L"ErrOutDev");\r
       } else {\r
-        Status = ConnectFromDevPaths(L"ErrOutDev");\r
+        Status = ShellConnectFromDevPaths(L"ErrOutDev");\r
       }\r
       if (EFI_ERROR(Status)) {\r
-        ConnectFromDevPaths(L"ErrOut");\r
+        ShellConnectFromDevPaths(L"ErrOut");\r
       } else {\r
-        Status = ConnectFromDevPaths(L"ErrOut");\r
+        Status = ShellConnectFromDevPaths(L"ErrOut");\r
       }\r
       if (EFI_ERROR(Status)) {\r
-        ConnectFromDevPaths(L"ConIn");\r
+        ShellConnectFromDevPaths(L"ConIn");\r
       } else {\r
-        Status = ConnectFromDevPaths(L"ConIn");\r
+        Status = ShellConnectFromDevPaths(L"ConIn");\r
       }\r
       if (EFI_ERROR(Status)) {\r
-        ConnectFromDevPaths(L"ConOut");\r
+        ShellConnectFromDevPaths(L"ConOut");\r
       } else {\r
-        Status = ConnectFromDevPaths(L"ConOut");\r
+        Status = ShellConnectFromDevPaths(L"ConOut");\r
       }\r
       if (EFI_ERROR(Status)) {\r
         ShellStatus = SHELL_DEVICE_ERROR;\r
@@ -503,7 +504,7 @@ ShellCommandRunConnect (
         Status  = ShellConvertStringToUint64(Param1, &Intermediate, TRUE, FALSE);\r
         Handle1 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
         if (EFI_ERROR(Status)) {\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param1);  \r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         }\r
       } else {\r
@@ -514,7 +515,7 @@ ShellCommandRunConnect (
         Status  = ShellConvertStringToUint64(Param2, &Intermediate, TRUE, FALSE);\r
         Handle2 = ConvertHandleIndexToHandle((UINTN)Intermediate);\r
         if (EFI_ERROR(Status)) {\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param2);\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);  \r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         }\r
       } else {\r
@@ -523,13 +524,13 @@ ShellCommandRunConnect (
       \r
       if (ShellStatus == SHELL_SUCCESS) {\r
         if (Param1 != NULL && Handle1 == NULL){\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param1);  \r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else if (Param2 != NULL && Handle2 == NULL) {\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param2);\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);  \r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else if (Handle2 != NULL && Handle1 != NULL && EFI_ERROR(gBS->OpenProtocol(Handle2, &gEfiDriverBindingProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param2);\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"connect", Param2);  \r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else {\r
           Status = ConvertAndConnectControllers(Handle1, Handle2, ShellCommandLineGetFlag(Package, L"-r"), (BOOLEAN)(Count!=0));\r