]> git.proxmox.com Git - mirror_edk2.git/blobdiff - ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
ShellPkg: Replace BSD License with BSD+Patent License
[mirror_edk2.git] / ShellPkg / Library / UefiShellDriver1CommandsLib / Dh.c
index 3694e501b6d63e951c517b907c110c69f38b33df..ab6d39c88bc1023c149d0403d7c4d70bd8c001d6 100644 (file)
@@ -2,15 +2,9 @@
   Main file for Dh shell Driver1 function.\r
 \r
   (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2017 Hewlett Packard Enterprise Development LP<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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -286,6 +280,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 +308,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
@@ -329,7 +336,7 @@ GetProtocolInfoString(
       }\r
     }\r
   }\r
-  \r
+\r
   SHELL_FREE_NON_NULL(ProtocolGuidArray);\r
 \r
   if (RetVal == NULL) {\r
@@ -382,7 +389,7 @@ GetDriverImageName (
 \r
 /**\r
   Display driver model information for a given handle.\r
-  \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
@@ -470,14 +477,14 @@ DisplayDriverModelHandle (
     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
+\r
     TempStringPointer = ConvertDevicePathToText(DevicePath, TRUE, FALSE);\r
     ShellPrintHiiEx(\r
-      -1, \r
-      -1, \r
-      NULL, \r
-      STRING_TOKEN (STR_DH_OUTPUT_DRIVER2), \r
-      gShellDriver1HiiHandle, \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
@@ -488,20 +495,20 @@ DisplayDriverModelHandle (
 \r
     if (DriverBindingHandleCount == 0) {\r
       ShellPrintHiiEx(\r
-        -1, \r
-        -1, \r
-        NULL, \r
-        STRING_TOKEN (STR_DH_OUTPUT_DRIVER3), \r
-        gShellDriver1HiiHandle, \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
+        -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
@@ -523,9 +530,9 @@ DisplayDriverModelHandle (
 \r
         if (Image) {\r
           ShellPrintHiiEx(\r
-            -1, \r
-            -1, \r
-            NULL, \r
+            -1,\r
+            -1,\r
+            NULL,\r
             STRING_TOKEN (STR_DH_OUTPUT_DRIVER4A),\r
             gShellDriver1HiiHandle,\r
             ConvertHandleToHandleIndex (DriverBindingHandleBuffer[Index]),\r
@@ -533,9 +540,9 @@ DisplayDriverModelHandle (
             );\r
         } else {\r
           ShellPrintHiiEx(\r
-            -1, \r
-            -1, \r
-            NULL, \r
+            -1,\r
+            -1,\r
+            NULL,\r
             STRING_TOKEN (STR_DH_OUTPUT_DRIVER4B),\r
             gShellDriver1HiiHandle,\r
             ConvertHandleToHandleIndex (DriverBindingHandleBuffer[Index]),\r
@@ -548,28 +555,28 @@ DisplayDriverModelHandle (
 \r
     if (ParentControllerHandleCount == 0) {\r
       ShellPrintHiiEx(\r
-        -1, \r
-        -1, \r
-        NULL, \r
-        STRING_TOKEN (STR_DH_OUTPUT_DRIVER5), \r
-        gShellDriver1HiiHandle, \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
+        -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
+          -1,\r
+          -1,\r
+          NULL,\r
           STRING_TOKEN (STR_DH_OUTPUT_DRIVER5B),\r
           gShellDriver1HiiHandle,\r
           ConvertHandleToHandleIndex (ParentControllerHandleBuffer[Index]),\r
@@ -581,28 +588,28 @@ DisplayDriverModelHandle (
 \r
     if (ChildControllerHandleCount == 0) {\r
       ShellPrintHiiEx(\r
-        -1, \r
-        -1, \r
-        NULL, \r
-        STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), \r
-        gShellDriver1HiiHandle, \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
+        -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
+          -1,\r
+          -1,\r
+          NULL,\r
           STRING_TOKEN (STR_DH_OUTPUT_DRIVER6B),\r
           gShellDriver1HiiHandle,\r
           ConvertHandleToHandleIndex (ChildControllerHandleBuffer[Index]),\r
@@ -662,9 +669,9 @@ DisplayDriverModelHandle (
   }\r
 \r
   ShellPrintHiiEx(\r
-    -1, \r
-    -1, \r
-    NULL, \r
+    -1,\r
+    -1,\r
+    NULL,\r
     STRING_TOKEN (STR_DH_OUTPUT_DRIVER7),\r
     gShellDriver1HiiHandle,\r
     ConvertHandleToHandleIndex(Handle),\r
@@ -679,9 +686,9 @@ DisplayDriverModelHandle (
     DriverName = NULL;\r
   }\r
   ShellPrintHiiEx(\r
-    -1, \r
-    -1, \r
-    NULL, \r
+    -1,\r
+    -1,\r
+    NULL,\r
     STRING_TOKEN (STR_DH_OUTPUT_DRIVER7B),\r
     gShellDriver1HiiHandle,\r
     DriverName!=NULL?DriverName:L"<Unknown>"\r
@@ -689,11 +696,11 @@ DisplayDriverModelHandle (
   SHELL_FREE_NON_NULL(DriverName);\r
 \r
   ShellPrintHiiEx(\r
-    -1, \r
-    -1, \r
-    NULL, \r
-    STRING_TOKEN (STR_DH_OUTPUT_DRIVER8), \r
-    gShellDriver1HiiHandle, \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
@@ -702,29 +709,29 @@ DisplayDriverModelHandle (
 \r
   if (ControllerHandleCount == 0) {\r
       ShellPrintHiiEx(\r
-        -1, \r
-        -1, \r
-        NULL, \r
-        STRING_TOKEN (STR_DH_OUTPUT_DRIVER6), \r
-        gShellDriver1HiiHandle, \r
+        -1,\r
+        -1,\r
+        NULL,\r
+        STRING_TOKEN (STR_DH_OUTPUT_DRIVER9),\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
+      -1,\r
+      -1,\r
+      NULL,\r
+      STRING_TOKEN (STR_DH_OUTPUT_DRIVER9),\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
+        -1,\r
+        -1,\r
+        NULL,\r
         STRING_TOKEN (STR_DH_OUTPUT_DRIVER9B),\r
         gShellDriver1HiiHandle,\r
         ConvertHandleToHandleIndex(ControllerHandleBuffer[HandleIndex]),\r
@@ -743,10 +750,10 @@ DisplayDriverModelHandle (
           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
+            -1,\r
+            -1,\r
+            NULL,\r
+            STRING_TOKEN (STR_DH_OUTPUT_DRIVER6C),\r
             gShellDriver1HiiHandle,\r
             ConvertHandleToHandleIndex(ChildControllerHandleBuffer[ChildIndex]),\r
             TempStringPointer!=NULL?TempStringPointer:L"<Unknown>"\r
@@ -1096,7 +1103,7 @@ ShellCommandRunDh (
   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, L"dh", ProblemParam);  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"dh", ProblemParam);\r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
@@ -1104,7 +1111,7 @@ ShellCommandRunDh (
     }\r
   } else {\r
     if (ShellCommandLineGetCount(Package) > 2) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"dh");  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"dh");\r
       ShellCommandLineFreeVarList (Package);\r
       return (SHELL_INVALID_PARAMETER);\r
     }\r