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

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

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
index 3694e501b6d63e951c517b907c110c69f38b33df..7d06163a7b27b1673b758967cdab0acb481d51ce 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
@@ -286,6 +286,8 @@ GetProtocolInfoString(
   UINTN                     Size;\r
   CHAR16                    *Temp;\r
   CHAR16                    GuidStr[40];\r
+  VOID                      *instance;\r
+  CHAR16                    InstanceStr[17];\r
 \r
   ProtocolGuidArray = NULL;\r
   RetVal            = NULL;\r
@@ -312,6 +314,17 @@ GetProtocolInfoString(
         FreePool(Temp);\r
       }\r
       StrnCatGrow(&RetVal, &Size, L"%N", 0);\r
+\r
+      if(Verbose) {\r
+        Status = gBS->HandleProtocol (TheHandle, ProtocolGuidArray[ProtocolIndex], &instance);\r
+        if (!EFI_ERROR (Status)) {\r
+          StrnCatGrow (&RetVal, &Size, L"(%H", 0);\r
+          UnicodeSPrint (InstanceStr, sizeof (InstanceStr), L"%x", instance);\r
+          StrnCatGrow (&RetVal, &Size, InstanceStr, 0);\r
+          StrnCatGrow (&RetVal, &Size, L"%N)", 0);\r
+        }\r
+      }\r
+\r
       if (ExtraInfo) {\r
         Temp = GetProtocolInformationDump(TheHandle, ProtocolGuidArray[ProtocolIndex], Verbose);\r
         if (Temp != NULL) {\r
@@ -705,7 +718,7 @@ DisplayDriverModelHandle (
         -1, \r
         -1, \r
         NULL, \r
-        STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), \r
+        STRING_TOKEN (STR_DH_OUTPUT_DRIVER9),\r
         gShellDriver1HiiHandle, \r
         L"None"\r
         );\r
@@ -714,7 +727,7 @@ DisplayDriverModelHandle (
       -1, \r
       -1, \r
       NULL, \r
-      STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), \r
+      STRING_TOKEN (STR_DH_OUTPUT_DRIVER9),\r
       gShellDriver1HiiHandle, \r
       L""\r
       );\r
@@ -746,7 +759,7 @@ DisplayDriverModelHandle (
             -1, \r
             -1, \r
             NULL, \r
-            STRING_TOKEN (STR_DH_OUTPUT_DRIVER6B),\r
+            STRING_TOKEN (STR_DH_OUTPUT_DRIVER6C),\r
             gShellDriver1HiiHandle,\r
             ConvertHandleToHandleIndex(ChildControllerHandleBuffer[ChildIndex]),\r
             TempStringPointer!=NULL?TempStringPointer:L"<Unknown>"\r