ShellPkg: Fixes and updates for the 'devices' command

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

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
index d10ce56806487fe2832c66b8a97fb881a45bf57b..a33bed9dc82aec5e2194aa8efd187672b014fc02 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for Disconnect shell Driver1 function.\r
 \r
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2012, 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
@@ -19,6 +19,11 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
   {NULL, TypeMax}\r
   };\r
 \r
+/**\r
+  Disconnect everything.\r
+\r
+  @retval EFI_SUCCESS     The operation was successful.\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 DisconnectAll(\r
@@ -67,6 +72,12 @@ DisconnectAll(
   return (EFI_SUCCESS);\r
 }\r
 \r
+/**\r
+  Function for 'disconnect' command.\r
+\r
+  @param[in] ImageHandle  Handle to the Image (NULL if Internal).\r
+  @param[in] SystemTable  Pointer to the System Table (NULL if Internal).\r
+**/\r
 SHELL_STATUS\r
 EFIAPI\r
 ShellCommandRunDisconnect (\r
@@ -84,6 +95,9 @@ ShellCommandRunDisconnect (
   EFI_HANDLE          Handle1;\r
   EFI_HANDLE          Handle2;\r
   EFI_HANDLE          Handle3;\r
+  UINT64              Intermediate1;\r
+  UINT64              Intermediate2;\r
+  UINT64              Intermediate3;\r
 \r
   ShellStatus         = SHELL_SUCCESS;\r
 \r
@@ -133,9 +147,12 @@ ShellCommandRunDisconnect (
         Param1  = ShellCommandLineGetRawValue(Package, 1);\r
         Param2  = ShellCommandLineGetRawValue(Package, 2);\r
         Param3  = ShellCommandLineGetRawValue(Package, 3);\r
-        Handle1 = Param1!=NULL?ConvertHandleIndexToHandle(StrHexToUintn(Param1)):NULL;\r
-        Handle2 = Param2!=NULL?ConvertHandleIndexToHandle(StrHexToUintn(Param2)):NULL;\r
-        Handle3 = Param3!=NULL?ConvertHandleIndexToHandle(StrHexToUintn(Param3)):NULL;\r
+        ShellConvertStringToUint64(Param1, &Intermediate1, TRUE, FALSE);\r
+        Handle1 = Param1!=NULL?ConvertHandleIndexToHandle((UINTN)Intermediate1):NULL;\r
+        ShellConvertStringToUint64(Param2, &Intermediate2, TRUE, FALSE);\r
+        Handle2 = Param2!=NULL?ConvertHandleIndexToHandle((UINTN)Intermediate2):NULL;\r
+        ShellConvertStringToUint64(Param3, &Intermediate3, TRUE, FALSE);\r
+        Handle3 = Param3!=NULL?ConvertHandleIndexToHandle((UINTN)Intermediate3):NULL;\r
 \r
         if (Param1 != NULL && Handle1 == NULL) {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param1);\r
@@ -146,20 +163,14 @@ ShellCommandRunDisconnect (
         } else if (Param3 != NULL && Handle3 == NULL) {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Param3);\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
-        } else if (EFI_ERROR(gBS->OpenProtocol(Handle1, &gEfiDevicePathProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
-          ASSERT(Param1 != NULL);\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_NOT), gShellDriver1HiiHandle, StrHexToUintn(Param1), L"controller handle");\r
-          ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else if (Handle2 != NULL && EFI_ERROR(gBS->OpenProtocol(Handle2, &gEfiDriverBindingProtocolGuid, NULL, gImageHandle, NULL, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
           ASSERT(Param2 != NULL);\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_NOT), gShellDriver1HiiHandle, StrHexToUintn(Param2), L"driver handle");\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_HANDLE_NOT), gShellDriver1HiiHandle, ShellStrToUintn(Param2), L"driver handle");\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else {\r
           ASSERT(Param1 != NULL);\r
-          ASSERT(Param2 != NULL);\r
-          ASSERT(Param3 != NULL);\r
           Status = gBS->DisconnectController(Handle1, Handle2, Handle3);\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_3P_RESULT), gShellDriver1HiiHandle, L"Disconnect", Handle1, Handle2, Handle3, Status);\r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_3P_RESULT), gShellDriver1HiiHandle, L"Disconnect", (UINTN)Intermediate1, (UINTN)Intermediate2, (UINTN)Intermediate3, Status);\r
         }\r
       }\r
     }\r