ShellPkg: Fixes and updates for the 'devices' command

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

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
index 8a5c79b8cbfa089f27a86353fa914bbca5bc1973..15487703790d2d8f24f8d45a357c29cfbf14ca4c 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for DevTree 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
@@ -20,6 +20,18 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
   {NULL, TypeMax}\r
   };\r
 \r
+/**\r
+  Display a tree starting from this handle.\r
+\r
+  @param[in] TheHandle      The handle to start with.\r
+  @param[in] Lang           Optionally, a UEFI defined language code.\r
+  @param[in] UseDevPaths    TRUE to display info from DevPath as identifiers.\r
+                            FALSE will use component name protocol instead.\r
+  @param[in] IndentCharCount   How many characters to indent (allows for recursion).\r
+  @param[in] HiiString      The string from HII to use for output.\r
+\r
+  @retval SHELL_SUCCESS     The operation was successful.\r
+**/\r
 SHELL_STATUS\r
 EFIAPI\r
 DoDevTreeForHandle(\r
@@ -72,23 +84,6 @@ DoDevTreeForHandle(
     return SHELL_SUCCESS;\r
   }\r
 \r
-  //\r
-  // If we are at the begining then we want root handles they have no parents and do have device path.\r
-  //\r
-  if (IndentCharCount == 0) {\r
-    Status = gBS->OpenProtocol (\r
-                  TheHandle,\r
-                  &gEfiDevicePathProtocolGuid,\r
-                  NULL,\r
-                  NULL,\r
-                  NULL,\r
-                  EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
-                 );\r
-    if (EFI_ERROR (Status)) {\r
-      return SHELL_SUCCESS;\r
-    }\r
-  }\r
-\r
   FormatString        = AllocateZeroPool(StrSize(HiiString) + (10)*sizeof(FormatString[0]));\r
 \r
   ASSERT(HiiString    != NULL);\r
@@ -156,6 +151,9 @@ ShellCommandRunDevTree (
   UINTN               LoopVar;\r
   EFI_HANDLE          TheHandle;\r
   BOOLEAN             FlagD;\r
+  UINT64              Intermediate;\r
+  UINTN               ParentControllerHandleCount;\r
+  EFI_HANDLE          *ParentControllerHandleBuffer;\r
 \r
   ShellStatus         = SHELL_SUCCESS;\r
   Status              = EFI_SUCCESS;\r
@@ -213,14 +211,48 @@ ShellCommandRunDevTree (
         if (TheHandle == NULL){\r
           break;\r
         }\r
+\r
+        //\r
+        // Skip handles that do not have device path protocol\r
+        //\r
+        Status = gBS->OpenProtocol (\r
+                      TheHandle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      NULL,\r
+                      NULL,\r
+                      NULL,\r
+                      EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
+                     );\r
+        if (EFI_ERROR (Status)) {\r
+          continue;\r
+        }\r
+\r
+        //\r
+        // Skip handles that do have parents\r
+        //\r
+        ParentControllerHandleBuffer = NULL;\r
+        Status = PARSE_HANDLE_DATABASE_PARENTS (\r
+                   TheHandle,\r
+                   &ParentControllerHandleCount,\r
+                   &ParentControllerHandleBuffer\r
+                   );\r
+        SHELL_FREE_NON_NULL (ParentControllerHandleBuffer);\r
+        if (ParentControllerHandleCount > 0) {\r
+          continue;\r
+        }\r
+\r
+        //\r
+        // Start a devtree from TheHandle that has a device path and no parents\r
+        //\r
         ShellStatus = DoDevTreeForHandle(TheHandle, Language, FlagD, 0, HiiString);\r
       }\r
     } else {\r
-      if (!ShellIsHexOrDecimalNumber(Lang, TRUE, FALSE) || ConvertHandleIndexToHandle(StrHexToUintn(Lang)) == NULL) {\r
+      Status = ShellConvertStringToUint64(Lang, &Intermediate, TRUE, FALSE);\r
+      if (EFI_ERROR(Status) || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL) {\r
         ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, Lang);\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
       } else {\r
-        ShellStatus = DoDevTreeForHandle(ConvertHandleIndexToHandle(StrHexToUintn(Lang)), Language, FlagD, 0, HiiString);\r
+        ShellStatus = DoDevTreeForHandle(ConvertHandleIndexToHandle((UINTN)Intermediate), Language, FlagD, 0, HiiString);\r
       }\r
     }\r
 \r