]> git.proxmox.com Git - mirror_edk2.git/blobdiff - ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
Refine the select language logic.
[mirror_edk2.git] / ShellPkg / Library / UefiShellDriver1CommandsLib / Dh.c
index 3d3f1b19f461ec48e71a7468ce8b88bee8a555f7..1bb3191f4153e6a994ffca07fd4efdabc507b4ab 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for Dh shell Driver1 function.\r
 \r
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2013, 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
@@ -40,6 +40,71 @@ STATIC CONST EFI_GUID *UefiDriverModelProtocolsGuidArray[] = {
   NULL\r
 };\r
 \r
+/**\r
+  Get the name of a driver by it's handle.\r
+\r
+  If a name is found the memory must be callee freed.\r
+\r
+  @param[in] TheHandle    The driver's handle.\r
+  @param[in] Language     The language to use.\r
+  @param[in] NameFound    Upon a successful return the name found.\r
+\r
+  @retval EFI_SUCCESS     The name was found.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+GetDriverName (\r
+  IN EFI_HANDLE   TheHandle,\r
+  IN CONST CHAR8  *Language,\r
+  IN CHAR16       **NameFound\r
+  )\r
+{\r
+  CHAR8                             *Lang;\r
+  EFI_STATUS                        Status;\r
+  EFI_COMPONENT_NAME2_PROTOCOL      *CompName2;\r
+  CHAR16                            *NameToReturn;\r
+  //\r
+  // Go through those handles until we get one that passes for GetComponentName\r
+  //\r
+  Status = gBS->OpenProtocol(\r
+    TheHandle,\r
+    &gEfiComponentName2ProtocolGuid,\r
+    (VOID**)&CompName2,\r
+    gImageHandle,\r
+    NULL,\r
+    EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+  if (EFI_ERROR(Status)) {\r
+    Status = gBS->OpenProtocol(\r
+      TheHandle,\r
+      &gEfiComponentNameProtocolGuid,\r
+      (VOID**)&CompName2,\r
+      gImageHandle,\r
+      NULL,\r
+      EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
+  }\r
+\r
+  if (EFI_ERROR(Status)) {\r
+    return (EFI_NOT_FOUND);\r
+  }\r
+  Lang = GetBestLanguageForDriver (CompName2->SupportedLanguages, Language, FALSE);\r
+  Status = CompName2->GetDriverName(CompName2, Lang, &NameToReturn);\r
+  FreePool(Lang);\r
+\r
+  if (!EFI_ERROR(Status) && NameToReturn != NULL) {\r
+    *NameFound = NULL;\r
+    StrnCatGrow(NameFound, NULL, NameToReturn, 0);\r
+  }\r
+  return (Status);\r
+}\r
+\r
+/**\r
+  Discover if a protocol guid is one of the UEFI Driver Model Protocols.\r
+\r
+  @param[in] Guid   The guid to test.\r
+\r
+  @retval TRUE      The guid does represent a driver model protocol.\r
+  @retval FALSE     The guid does not represent a driver model protocol.\r
+**/\r
 BOOLEAN\r
 EFIAPI\r
 IsDriverProt (\r
@@ -61,13 +126,24 @@ IsDriverProt (
   return (GuidFound);\r
 }\r
 \r
+/**\r
+  Get information for a handle.\r
+\r
+  @param[in] TheHandle        The handles to show info on.\r
+  @param[in] Language         Language string per UEFI specification.\r
+  @param[in] Seperator        Separator string between information blocks.\r
+  @param[in] Verbose          TRUE for extra info, FALSE otherwise.\r
+  @param[in] ExtraInfo        TRUE for extra info, FALSE otherwise.\r
+\r
+  @retval SHELL_SUCCESS           The operation was successful.\r
+  @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
+**/\r
 CHAR16*\r
 EFIAPI\r
 GetProtocolInfoString(\r
   IN CONST EFI_HANDLE TheHandle,\r
   IN CONST CHAR8      *Language,\r
   IN CONST CHAR16     *Seperator,\r
-  IN CONST BOOLEAN    DriverInfo,\r
   IN CONST BOOLEAN    Verbose,\r
   IN CONST BOOLEAN    ExtraInfo\r
   )\r
@@ -81,6 +157,8 @@ GetProtocolInfoString(
   CHAR16                    *Temp;\r
 \r
   ProtocolGuidArray = NULL;\r
+  RetVal            = NULL;\r
+  Size              = 0;\r
 \r
   Status = gBS->ProtocolsPerHandle (\r
                 TheHandle,\r
@@ -88,8 +166,6 @@ GetProtocolInfoString(
                 &ArrayCount\r
                );\r
   if (!EFI_ERROR (Status)) {\r
-    RetVal = NULL;\r
-    Size   = 0;\r
     for (ProtocolIndex = 0; ProtocolIndex < ArrayCount; ProtocolIndex++) {\r
       Temp = GetStringNameFromGuid(ProtocolGuidArray[ProtocolIndex], Language);\r
       if (Temp != NULL) {\r
@@ -109,7 +185,7 @@ GetProtocolInfoString(
           if (!Verbose) {\r
             StrnCatGrow(&RetVal, &Size, L"(", 0);\r
             StrnCatGrow(&RetVal, &Size, Temp, 0);\r
-            StrnCatGrow(&RetVal, &Size, L")", 0);\r
+            StrnCatGrow(&RetVal, &Size, L")\r\n", 0);\r
           } else {\r
             StrnCatGrow(&RetVal, &Size, Seperator, 0);\r
             StrnCatGrow(&RetVal, &Size, Temp, 0);\r
@@ -118,18 +194,456 @@ GetProtocolInfoString(
         }\r
       }\r
     }\r
-  } else {\r
-    return (NULL);\r
   }\r
+  \r
+  SHELL_FREE_NON_NULL(ProtocolGuidArray);\r
 \r
-  if (ProtocolGuidArray != NULL) {\r
-    FreePool(ProtocolGuidArray);\r
+  if (RetVal == NULL) {\r
+    return (NULL);\r
   }\r
+\r
   ASSERT((RetVal == NULL && Size == 0) || (RetVal != NULL));\r
   StrnCatGrow(&RetVal, &Size, Seperator, 0);\r
   return (RetVal);\r
 }\r
 \r
+/**\r
+  Gets the name of the loaded image.\r
+\r
+  @param[in] TheHandle    The handle of the driver to get info on.\r
+  @param[out] Name        The pointer to the pointer.  Valid upon a successful return.\r
+\r
+  @retval EFI_SUCCESS     The operation was successful.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+GetDriverImageName (\r
+  IN EFI_HANDLE   TheHandle,\r
+  OUT CHAR16      **Name\r
+  )\r
+{\r
+  // get loaded image and devicepathtotext on image->Filepath\r
+  EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;\r
+  EFI_STATUS                Status;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+\r
+  if (TheHandle == NULL || Name == NULL) {\r
+    return (EFI_INVALID_PARAMETER);\r
+  }\r
+\r
+  Status = gBS->OpenProtocol (\r
+                TheHandle,\r
+                &gEfiLoadedImageProtocolGuid,\r
+                (VOID **) &LoadedImage,\r
+                gImageHandle,\r
+                NULL,\r
+                EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+               );\r
+  if (EFI_ERROR(Status)) {\r
+    return (Status);\r
+  }\r
+  DevicePath = LoadedImage->FilePath;\r
+  *Name = ConvertDevicePathToText(DevicePath, TRUE, TRUE);\r
+  return (EFI_SUCCESS);\r
+}\r
+\r
+/**\r
+  Display driver model information for a given handle.\r
+  \r
+  @param[in] Handle     The handle to display info on.\r
+  @param[in] BestName   Use the best name?\r
+  @param[in] Language   The language to output in.\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+DisplayDriverModelHandle (\r
+  IN EFI_HANDLE  Handle,\r
+  IN BOOLEAN     BestName,\r
+  IN CONST CHAR8 *Language OPTIONAL\r
+  )\r
+{\r
+  EFI_STATUS                  Status;\r
+  BOOLEAN                     ConfigurationStatus;\r
+  BOOLEAN                     DiagnosticsStatus;\r
+  UINTN                       DriverBindingHandleCount;\r
+  EFI_HANDLE                  *DriverBindingHandleBuffer;\r
+  UINTN                       ParentControllerHandleCount;\r
+  EFI_HANDLE                  *ParentControllerHandleBuffer;\r
+  UINTN                       ChildControllerHandleCount;\r
+  EFI_HANDLE                  *ChildControllerHandleBuffer;\r
+  CHAR16                      *TempStringPointer;\r
+  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;\r
+  UINTN                       Index;\r
+  CHAR16                      *DriverName;\r
+  EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;\r
+  UINTN                       NumberOfChildren;\r
+  UINTN                       HandleIndex;\r
+  UINTN                       ControllerHandleCount;\r
+  EFI_HANDLE                  *ControllerHandleBuffer;\r
+  UINTN                       ChildIndex;\r
+  BOOLEAN                     Image;\r
+\r
+  //\r
+  // See if Handle is a device handle and display its details.\r
+  //\r
+  DriverBindingHandleBuffer = NULL;\r
+  Status = PARSE_HANDLE_DATABASE_UEFI_DRIVERS (\r
+            Handle,\r
+            &DriverBindingHandleCount,\r
+            &DriverBindingHandleBuffer\r
+            );\r
+\r
+  ParentControllerHandleBuffer = NULL;\r
+  Status = PARSE_HANDLE_DATABASE_PARENTS (\r
+            Handle,\r
+            &ParentControllerHandleCount,\r
+            &ParentControllerHandleBuffer\r
+            );\r
+\r
+  ChildControllerHandleBuffer = NULL;\r
+  Status = ParseHandleDatabaseForChildControllers (\r
+            Handle,\r
+            &ChildControllerHandleCount,\r
+            &ChildControllerHandleBuffer\r
+            );\r
+\r
+  DiagnosticsStatus = FALSE;\r
+  ConfigurationStatus = FALSE;\r
+\r
+  if (!EFI_ERROR(gBS->OpenProtocol(Handle, &gEfiDriverConfigurationProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
+    ConfigurationStatus = TRUE;\r
+  }\r
+  if (!EFI_ERROR(gBS->OpenProtocol(Handle, &gEfiDriverConfiguration2ProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
+    ConfigurationStatus = TRUE;\r
+  }\r
+  if (!EFI_ERROR(gBS->OpenProtocol(Handle, &gEfiDriverDiagnosticsProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
+    DiagnosticsStatus = TRUE;\r
+  }\r
+  if (!EFI_ERROR(gBS->OpenProtocol(Handle, &gEfiDriverDiagnostics2ProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {\r
+    DiagnosticsStatus = TRUE;\r
+  }\r
+\r
+  Status = EFI_SUCCESS;\r
+\r
+  if (DriverBindingHandleCount > 0 || ParentControllerHandleCount > 0 || ChildControllerHandleCount > 0) {\r
+\r
+\r
+\r
+    DevicePath          = NULL;\r
+    TempStringPointer   = NULL;\r
+    Status              = gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID**)&DevicePath);\r
+\r
+    Status = gEfiShellProtocol->GetDeviceName(Handle, EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8*)Language, &TempStringPointer);\r
+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DH_OUTPUT_DRIVER1), gShellDriver1HiiHandle, TempStringPointer!=NULL?TempStringPointer:L"<Unknown>");\r
+    SHELL_FREE_NON_NULL(TempStringPointer);\r
+  \r
+    TempStringPointer = ConvertDevicePathToText(DevicePath, TRUE, FALSE);\r
+    ShellPrintHiiEx(\r
+      -1, \r
+      -1, \r
+      NULL, \r
+      STRING_TOKEN (STR_DH_OUTPUT_DRIVER2), \r
+      gShellDriver1HiiHandle, \r
+      TempStringPointer!=NULL?TempStringPointer:L"<None>",\r
+      ParentControllerHandleCount == 0?L"ROOT":(ChildControllerHandleCount > 0)?L"BUS":L"DEVICE",\r
+      ConfigurationStatus?L"YES":L"NO",\r
+      DiagnosticsStatus?L"YES":L"NO"\r
+      );\r
+\r
+    SHELL_FREE_NON_NULL(TempStringPointer);\r
+\r
+    if (DriverBindingHandleCount == 0) {\r
+      ShellPrintHiiEx(\r
+        -1, \r
+        -1, \r
+        NULL, \r
+        STRING_TOKEN (STR_DH_OUTPUT_DRIVER3), \r
+        gShellDriver1HiiHandle, \r
+        L"<None>"\r
+        );\r
+    } else {\r
+      ShellPrintHiiEx(\r
+        -1, \r
+        -1, \r
+        NULL, \r
+        STRING_TOKEN (STR_DH_OUTPUT_DRIVER3), \r
+        gShellDriver1HiiHandle, \r
+        L""\r
+        );\r
+      for (Index = 0; Index < DriverBindingHandleCount; Index++) {\r
+        Image = FALSE;\r
+        Status = GetDriverName (\r
+                  DriverBindingHandleBuffer[Index],\r
+                  Language,\r
+                  &DriverName\r
+                  );\r
+        if (EFI_ERROR (Status)) {\r
+          Status = GetDriverImageName (\r
+                    DriverBindingHandleBuffer[Index],\r
+                    &DriverName\r
+                    );\r
+          if (EFI_ERROR (Status)) {\r
+            DriverName = NULL;\r
+          }\r
+        }\r
+\r
+        if (Image) {\r
+          ShellPrintHiiEx(\r
+            -1, \r
+            -1, \r
+            NULL, \r
+            STRING_TOKEN (STR_DH_OUTPUT_DRIVER4A),\r
+            gShellDriver1HiiHandle,\r
+            ConvertHandleToHandleIndex (DriverBindingHandleBuffer[Index]),\r
+            DriverName!=NULL?DriverName:L"<Unknown>"\r
+            );\r
+        } else {\r
+          ShellPrintHiiEx(\r
+            -1, \r
+            -1, \r
+            NULL, \r
+            STRING_TOKEN (STR_DH_OUTPUT_DRIVER4B),\r
+            gShellDriver1HiiHandle,\r
+            ConvertHandleToHandleIndex (DriverBindingHandleBuffer[Index]),\r
+            DriverName!=NULL?DriverName:L"<Unknown>"\r
+            );\r
+        }\r
+        SHELL_FREE_NON_NULL(DriverName);\r
+      }\r
+    }\r
+\r
+    if (ParentControllerHandleCount == 0) {\r
+      ShellPrintHiiEx(\r
+        -1, \r
+        -1, \r
+        NULL, \r
+        STRING_TOKEN (STR_DH_OUTPUT_DRIVER5), \r
+        gShellDriver1HiiHandle, \r
+        L"<None>"\r
+        );\r
+    } else {\r
+      ShellPrintHiiEx(\r
+        -1, \r
+        -1, \r
+        NULL, \r
+        STRING_TOKEN (STR_DH_OUTPUT_DRIVER5), \r
+        gShellDriver1HiiHandle, \r
+        L""\r
+        );\r
+      for (Index = 0; Index < ParentControllerHandleCount; Index++) {\r
+        Status = gEfiShellProtocol->GetDeviceName(ParentControllerHandleBuffer[Index], EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8*)Language, &TempStringPointer);\r
+        ShellPrintHiiEx(\r
+          -1, \r
+          -1, \r
+          NULL, \r
+          STRING_TOKEN (STR_DH_OUTPUT_DRIVER5B),\r
+          gShellDriver1HiiHandle,\r
+          ConvertHandleToHandleIndex (ParentControllerHandleBuffer[Index]),\r
+          TempStringPointer!=NULL?TempStringPointer:L"<Unknown>"\r
+          );\r
+        SHELL_FREE_NON_NULL(TempStringPointer);\r
+      }\r
+    }\r
+\r
+    if (ChildControllerHandleCount == 0) {\r
+      ShellPrintHiiEx(\r
+        -1, \r
+        -1, \r
+        NULL, \r
+        STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), \r
+        gShellDriver1HiiHandle, \r
+        L"<None>"\r
+        );\r
+    } else {\r
+      ShellPrintHiiEx(\r
+        -1, \r
+        -1, \r
+        NULL, \r
+        STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), \r
+        gShellDriver1HiiHandle, \r
+        L""\r
+        );\r
+      for (Index = 0; Index < ChildControllerHandleCount; Index++) {\r
+        Status = gEfiShellProtocol->GetDeviceName(ChildControllerHandleBuffer[Index], EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8*)Language, &TempStringPointer);\r
+        ShellPrintHiiEx(\r
+          -1, \r
+          -1, \r
+          NULL, \r
+          STRING_TOKEN (STR_DH_OUTPUT_DRIVER6B),\r
+          gShellDriver1HiiHandle,\r
+          ConvertHandleToHandleIndex (ChildControllerHandleBuffer[Index]),\r
+          TempStringPointer!=NULL?TempStringPointer:L"<Unknown>"\r
+          );\r
+        SHELL_FREE_NON_NULL(TempStringPointer);\r
+      }\r
+    }\r
+  }\r
+\r
+  SHELL_FREE_NON_NULL(DriverBindingHandleBuffer);\r
+\r
+  SHELL_FREE_NON_NULL(ParentControllerHandleBuffer);\r
+\r
+  SHELL_FREE_NON_NULL(ChildControllerHandleBuffer);\r
+\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+  //\r
+  // See if Handle is a driver binding handle and display its details.\r
+  //\r
+  Status = gBS->OpenProtocol (\r
+                Handle,\r
+                &gEfiDriverBindingProtocolGuid,\r
+                (VOID **) &DriverBinding,\r
+                NULL,\r
+                NULL,\r
+                EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                );\r
+  if (EFI_ERROR (Status)) {\r
+    return EFI_SUCCESS;\r
+  }\r
+\r
+  NumberOfChildren        = 0;\r
+  ControllerHandleBuffer  = NULL;\r
+  Status = PARSE_HANDLE_DATABASE_DEVICES (\r
+            Handle,\r
+            &ControllerHandleCount,\r
+            &ControllerHandleBuffer\r
+            );\r
+  if (ControllerHandleCount > 0) {\r
+    for (HandleIndex = 0; HandleIndex < ControllerHandleCount; HandleIndex++) {\r
+      Status = PARSE_HANDLE_DATABASE_MANAGED_CHILDREN (\r
+                Handle,\r
+                ControllerHandleBuffer[HandleIndex],\r
+                &ChildControllerHandleCount,\r
+                NULL\r
+                );\r
+      NumberOfChildren += ChildControllerHandleCount;\r
+    }\r
+  }\r
+\r
+  Status = GetDriverName (Handle, Language, &DriverName);\r
+  if (EFI_ERROR (Status)) {\r
+    DriverName = NULL;\r
+  }\r
+\r
+  ShellPrintHiiEx(\r
+    -1, \r
+    -1, \r
+    NULL, \r
+    STRING_TOKEN (STR_DH_OUTPUT_DRIVER6B),\r
+    gShellDriver1HiiHandle,\r
+    ConvertHandleToHandleIndex(Handle),\r
+    DriverName!=NULL?DriverName:L"<Unknown>"\r
+    );\r
+  SHELL_FREE_NON_NULL(DriverName);\r
+  Status = GetDriverImageName (\r
+            Handle,\r
+            &DriverName\r
+            );\r
+  if (EFI_ERROR (Status)) {\r
+    DriverName = NULL;\r
+  }\r
+  ShellPrintHiiEx(\r
+    -1, \r
+    -1, \r
+    NULL, \r
+    STRING_TOKEN (STR_DH_OUTPUT_DRIVER7B),\r
+    gShellDriver1HiiHandle,\r
+    DriverName!=NULL?DriverName:L"<Unknown>"\r
+    );\r
+  SHELL_FREE_NON_NULL(DriverName);\r
+\r
+  ShellPrintHiiEx(\r
+    -1, \r
+    -1, \r
+    NULL, \r
+    STRING_TOKEN (STR_DH_OUTPUT_DRIVER8), \r
+    gShellDriver1HiiHandle, \r
+    DriverBinding->Version,\r
+    NumberOfChildren > 0?L"Bus":ControllerHandleCount > 0?L"Device":L"<Unknown>",\r
+    ConfigurationStatus?L"YES":L"NO",\r
+    DiagnosticsStatus?L"YES":L"NO"\r
+    );\r
+\r
+  if (ControllerHandleCount == 0) {\r
+      ShellPrintHiiEx(\r
+        -1, \r
+        -1, \r
+        NULL, \r
+        STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), \r
+        gShellDriver1HiiHandle, \r
+        L"None"\r
+        );\r
+  } else {\r
+    ShellPrintHiiEx(\r
+      -1, \r
+      -1, \r
+      NULL, \r
+      STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), \r
+      gShellDriver1HiiHandle, \r
+      L""\r
+      );\r
+    for (HandleIndex = 0; HandleIndex < ControllerHandleCount; HandleIndex++) {\r
+      Status = gEfiShellProtocol->GetDeviceName(ControllerHandleBuffer[HandleIndex], EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8*)Language, &TempStringPointer);\r
+\r
+      ShellPrintHiiEx(\r
+        -1, \r
+        -1, \r
+        NULL, \r
+        STRING_TOKEN (STR_DH_OUTPUT_DRIVER9B),\r
+        gShellDriver1HiiHandle,\r
+        ConvertHandleToHandleIndex(ControllerHandleBuffer[HandleIndex]),\r
+        TempStringPointer!=NULL?TempStringPointer:L"<Unknown>"\r
+        );\r
+      SHELL_FREE_NON_NULL(TempStringPointer);\r
+\r
+      Status = PARSE_HANDLE_DATABASE_MANAGED_CHILDREN (\r
+                Handle,\r
+                ControllerHandleBuffer[HandleIndex],\r
+                &ChildControllerHandleCount,\r
+                &ChildControllerHandleBuffer\r
+                );\r
+      if (!EFI_ERROR (Status)) {\r
+        for (ChildIndex = 0; ChildIndex < ChildControllerHandleCount; ChildIndex++) {\r
+          Status = gEfiShellProtocol->GetDeviceName(ChildControllerHandleBuffer[ChildIndex], EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8*)Language, &TempStringPointer);\r
+\r
+          ShellPrintHiiEx(\r
+            -1, \r
+            -1, \r
+            NULL, \r
+            STRING_TOKEN (STR_DH_OUTPUT_DRIVER6B),\r
+            gShellDriver1HiiHandle,\r
+            ConvertHandleToHandleIndex(ChildControllerHandleBuffer[ChildIndex]),\r
+            TempStringPointer!=NULL?TempStringPointer:L"<Unknown>"\r
+            );\r
+          SHELL_FREE_NON_NULL(TempStringPointer);\r
+        }\r
+\r
+        SHELL_FREE_NON_NULL (ChildControllerHandleBuffer);\r
+      }\r
+    }\r
+\r
+    SHELL_FREE_NON_NULL (ControllerHandleBuffer);\r
+  }\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+/**\r
+  Display information for a handle.\r
+\r
+  @param[in] TheHandle        The handles to show info on.\r
+  @param[in] Verbose          TRUE for extra info, FALSE otherwise.\r
+  @param[in] Sfo              TRUE to output in standard format output (spec).\r
+  @param[in] Language         Language string per UEFI specification.\r
+  @param[in] DriverInfo       TRUE to show all info about the handle.\r
+  @param[in] Multiple         TRUE indicates more than  will be output,\r
+                              FALSE for a single one.\r
+\r
+  @retval SHELL_SUCCESS           The operation was successful.\r
+  @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
+**/\r
 SHELL_STATUS\r
 EFIAPI\r
 DoDhByHandle(\r
@@ -143,15 +657,13 @@ DoDhByHandle(
 {\r
   CHAR16              *ProtocolInfoString;\r
   SHELL_STATUS        ShellStatus;\r
-  EFI_STATUS          Status;\r
 \r
-  Status              = EFI_SUCCESS;\r
   ShellStatus         = SHELL_SUCCESS;\r
   ProtocolInfoString  = NULL;\r
 \r
   if (!Sfo) {\r
     if (Multiple) {\r
-      ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L" ", DriverInfo, Verbose, TRUE);\r
+      ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L" ", Verbose, TRUE);\r
       ShellPrintHiiEx(\r
         -1,\r
         -1,\r
@@ -161,7 +673,7 @@ DoDhByHandle(
         ConvertHandleToHandleIndex(TheHandle),\r
         ProtocolInfoString==NULL?L"":ProtocolInfoString);\r
     } else {\r
-      ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L"\r\n", DriverInfo, Verbose, TRUE);\r
+      ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L"\r\n", Verbose, TRUE);\r
       ShellPrintHiiEx(\r
         -1,\r
         -1,\r
@@ -172,9 +684,12 @@ DoDhByHandle(
         TheHandle,\r
         ProtocolInfoString==NULL?L"":ProtocolInfoString);\r
     }\r
+\r
+    if (DriverInfo) {\r
+      DisplayDriverModelHandle ((EFI_HANDLE)TheHandle, TRUE, Language);\r
+    }\r
   } else {\r
-//#string STR_DH_OUTPUT_SFO         #language en-US "%s, %s, %s, %H%02x%N, %s, %s\r\n"\r
-      ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L";", DriverInfo, FALSE, FALSE);\r
+      ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L";", FALSE, FALSE);\r
       ShellPrintHiiEx(\r
         -1,\r
         -1,\r
@@ -198,10 +713,23 @@ DoDhByHandle(
   return (ShellStatus);\r
 }\r
 \r
+/**\r
+  Display information for all handles on a list.\r
+\r
+  @param[in] HandleList       The NULL-terminated list of handles.\r
+  @param[in] Verbose          TRUE for extra info, FALSE otherwise.\r
+  @param[in] Sfo              TRUE to output in standard format output (spec).\r
+  @param[in] Language         Language string per UEFI specification.\r
+  @param[in] DriverInfo       TRUE to show all info about the handle.\r
+\r
+  @retval SHELL_SUCCESS           The operation was successful.\r
+  @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
+**/\r
 SHELL_STATUS\r
 EFIAPI\r
 DoDhForHandleList(\r
   IN CONST EFI_HANDLE *HandleList,\r
+  IN CONST BOOLEAN    Verbose,\r
   IN CONST BOOLEAN    Sfo,\r
   IN CONST CHAR8      *Language,\r
   IN CONST BOOLEAN    DriverInfo\r
@@ -215,7 +743,7 @@ DoDhForHandleList(
   for (HandleWalker = HandleList ; HandleWalker != NULL && *HandleWalker != NULL && ShellStatus == SHELL_SUCCESS; HandleWalker++) {\r
     ShellStatus = DoDhByHandle(\r
           *HandleWalker,\r
-          FALSE,\r
+          Verbose,\r
           Sfo,\r
           Language,\r
           DriverInfo,\r
@@ -225,10 +753,22 @@ DoDhForHandleList(
   return (ShellStatus);\r
 }\r
 \r
+/**\r
+  Display information for all handles.\r
+\r
+  @param[in] Sfo              TRUE to output in standard format output (spec).\r
+  @param[in] Verbose          TRUE for extra info, FALSE otherwise.\r
+  @param[in] Language         Language string per UEFI specification.\r
+  @param[in] DriverInfo       TRUE to show all info about the handle.\r
+\r
+  @retval SHELL_SUCCESS           The operation was successful.\r
+  @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
+**/\r
 SHELL_STATUS\r
 EFIAPI\r
 DoDhForAll(\r
   IN CONST BOOLEAN  Sfo,\r
+  IN CONST BOOLEAN  Verbose,\r
   IN CONST CHAR8    *Language,\r
   IN CONST BOOLEAN  DriverInfo\r
   )\r
@@ -240,6 +780,7 @@ DoDhForAll(
 \r
   ShellStatus = DoDhForHandleList(\r
     HandleList,\r
+    Verbose,\r
     Sfo,\r
     Language,\r
     DriverInfo);\r
@@ -249,10 +790,23 @@ DoDhForAll(
   return (ShellStatus);\r
 }\r
 \r
+/**\r
+  Display information for all handles which have a specific protocol.\r
+\r
+  @param[in] ProtocolName     The pointer to the name of the protocol.\r
+  @param[in] Verbose          TRUE for extra info, FALSE otherwise.\r
+  @param[in] Sfo              TRUE to output in standard format output (spec).\r
+  @param[in] Language         Language string per UEFI specification.\r
+  @param[in] DriverInfo       TRUE to show all info about the handle.\r
+\r
+  @retval SHELL_SUCCESS           The operation was successful.\r
+  @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
+**/\r
 SHELL_STATUS\r
 EFIAPI\r
 DoDhByProtocol(\r
   IN CONST CHAR16   *ProtocolName,\r
+  IN CONST BOOLEAN  Verbose,\r
   IN CONST BOOLEAN  Sfo,\r
   IN CONST CHAR8    *Language,\r
   IN CONST BOOLEAN  DriverInfo\r
@@ -263,7 +817,9 @@ DoDhByProtocol(
   EFI_HANDLE    *HandleList;\r
   SHELL_STATUS  ShellStatus;\r
 \r
-  ASSERT(ProtocolName != NULL);\r
+  if (ProtocolName == NULL) {\r
+    return (SHELL_INVALID_PARAMETER);\r
+  }\r
 \r
   Status = GetGuidFromStringName(ProtocolName, Language, &Guid);\r
   if (EFI_ERROR(Status)) {\r
@@ -275,6 +831,7 @@ DoDhByProtocol(
 \r
   ShellStatus = DoDhForHandleList(\r
     HandleList,\r
+    Verbose,\r
     Sfo,\r
     Language,\r
     DriverInfo);\r
@@ -284,6 +841,12 @@ DoDhByProtocol(
   return (ShellStatus);\r
 }\r
 \r
+/**\r
+  Function for 'dh' 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
 ShellCommandRunDh (\r
@@ -301,6 +864,7 @@ ShellCommandRunDh (
   BOOLEAN             SfoMode;\r
   BOOLEAN             FlagD;\r
   BOOLEAN             Verbose;\r
+  UINT64              Intermediate;\r
 \r
   ShellStatus         = SHELL_SUCCESS;\r
   Status              = EFI_SUCCESS;\r
@@ -350,11 +914,7 @@ ShellCommandRunDh (
 \r
     SfoMode = ShellCommandLineGetFlag(Package, L"-sfo");\r
     FlagD   = ShellCommandLineGetFlag(Package, L"-d");\r
-    if (ShellCommandLineGetFlag(Package, L"-v") || ShellCommandLineGetFlag(Package, L"-verbose")) {\r
-      Verbose = TRUE;\r
-    } else {\r
-      Verbose = FALSE;\r
-    }\r
+    Verbose = (BOOLEAN)(ShellCommandLineGetFlag(Package, L"-v") || ShellCommandLineGetFlag(Package, L"-verbose"));\r
 \r
     if (ShellCommandLineGetFlag(Package, L"-p")) {\r
       if (ShellCommandLineGetCount(Package) > 1) {\r
@@ -369,6 +929,7 @@ ShellCommandRunDh (
         //\r
         ShellStatus = DoDhByProtocol(\r
           ShellCommandLineGetValue(Package, L"-p"),\r
+          Verbose,\r
           SfoMode,\r
           Lang==NULL?NULL:Language,\r
           FlagD\r
@@ -382,11 +943,13 @@ ShellCommandRunDh (
         //\r
         ShellStatus = DoDhForAll(\r
           SfoMode,\r
+          Verbose,\r
           Lang==NULL?NULL:Language,\r
           FlagD\r
          );\r
       } else {\r
-        if (!ShellIsHexOrDecimalNumber(Temp2, TRUE, FALSE) || ConvertHandleIndexToHandle(StrHexToUintn(Temp2)) == NULL) {\r
+        Status = ShellConvertStringToUint64(Temp2, &Intermediate, TRUE, FALSE);\r
+        if (EFI_ERROR(Status) || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL) {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Temp2);\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else {\r
@@ -394,7 +957,7 @@ ShellCommandRunDh (
           // print 1 handle\r
           //\r
           ShellStatus = DoDhByHandle(\r
-            ConvertHandleIndexToHandle(StrHexToUintn(Temp2)),\r
+            ConvertHandleIndexToHandle((UINTN)Intermediate),\r
             Verbose,\r
             SfoMode,\r
             Lang==NULL?NULL:Language,\r