Update all the code to consume the ConvertDevicePathToText, ConvertDevicePathNodeToText, ConvertTextToDevicePath and ConvertTextToDeviceNode APIs in DevicePathLib.

Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Elvin Li <elvin.li@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14505 6f19259b-4bc3-4df7-8a09-765794883524

IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

@@ -5,7 +5,7 @@
 #  2) BDS boot device connect interface;
 #  3) BDS Misc interfaces for mainting boot variable, ouput string, etc.
 #  
-#  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -70,24 +70,11 @@
   ReportStatusCodeLib
 
 [Guids]
-  gEfiVT100PlusGuid                             ## CONSUMES ## GUID (The type of terminal)
-  gEfiVT100Guid                                 ## CONSUMES ## GUID (The type of terminal)
-                                                ## CONSUMES ## GUID HOB (The hob holding memory type information)
   gEfiMemoryTypeInformationGuid                 ## CONSUMES ## GUID (The identifier of memory type information type in system table)
-  gEfiVTUTF8Guid                                ## CONSUMES ## GUID (The type of terminal)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"BootXX" (Boot option variable)
-                                                ## CONSUMES           ## Variable:L"Timeout" (The time out value in second of showing progress bar)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"BootOrder" (The boot option array)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"DriverOrder" (The driver order list)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ConIn" (The device path of console in device)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ConOut" (The device path of console out device)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" (The device path of error out device)
   gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootCurrent" (The boot option of current boot)
   gEfiFileInfoGuid                              ## CONSUMES ## GUID
-  gEfiPcAnsiGuid                                ## CONSUMES ## GUID (The type of terminal)
   gPerformanceProtocolGuid                      ## SOMETIMES_PRODUCES ## Variable:L"PerfDataMemAddr" (The ACPI address of performance data)
   gEfiUartDevicePathGuid                        ## CONSUMES ## GUID (Identify the device path for UARD device)
-  gEfiSasDevicePathGuid                         ## CONSUMES ## GUID (Identify the device path for SAS device)
   gLastEnumLangGuid                             ## SOMETIMES_PRODUCES ## Variable:L"LastEnumLang" (Platform language at last time enumeration.)
   gHdBootDevicePathVariablGuid                  ## SOMETIMES_PRODUCES ## Variable:L"HDDP" (The device path of Boot file on Hard device.)
   gBdsLibStringPackageGuid                      ## PRODUCES ## GUID (HII String PackageList Guid)
@@ -98,7 +85,6 @@
   gEfiSimpleTextOutProtocolGuid                 # PROTOCOL CONSUMES
   gEfiPciIoProtocolGuid                         # PROTOCOL CONSUMES
   gEfiLoadedImageProtocolGuid                   # PROTOCOL CONSUMES
-  gEfiDevicePathToTextProtocolGuid              # PROTOCOL SOMETIMES_CONSUMES
   gEfiSimpleNetworkProtocolGuid                 # PROTOCOL CONSUMES
   gEfiDebugPortProtocolGuid                     # PROTOCOL CONSUMES
   gEfiSimpleTextInProtocolGuid                  # PROTOCOL CONSUMES

IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h

@@ -31,7 +31,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/LegacyBios.h>
 #include <Protocol/SimpleTextOut.h>
 #include <Protocol/SimpleNetwork.h>
-#include <Protocol/DevicePathToText.h>
 #include <Protocol/FirmwareVolume2.h>
 #include <Protocol/PciIo.h>
 #include <Protocol/AcpiS3Save.h>

MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h

@@ -1,7 +1,7 @@
 /** @file
   Header files and data structures needed by PCI Bus module.
 
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -32,7 +32,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/IncompatiblePciDeviceSupport.h>
 #include <Protocol/PciOverride.h>
 #include <Protocol/PciEnumerationComplete.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Library/DebugLib.h>
 #include <Library/UefiDriverEntryPoint.h>

MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

@@ -5,7 +5,7 @@
 #  space for these devices. Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable
 #  hot plug supporting.
 #
-#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -97,7 +97,6 @@
   gEfiPciRootBridgeIoProtocolGuid                 ## CONSUMED
   gEfiIncompatiblePciDeviceSupportProtocolGuid    ## CONSUMED
   gEfiLoadFile2ProtocolGuid                       ## CONSUMED
-  gEfiDevicePathToTextProtocolGuid                ## CONSUMED
 
 [FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport

MdeModulePkg/Bus/Pci/PciBusDxe/PciLib.c

@@ -290,7 +290,6 @@ DumpResourceMap (
   PCI_RESOURCE_NODE                *ChildPMem32Node;
   PCI_RESOURCE_NODE                *ChildMem64Node;
   PCI_RESOURCE_NODE                *ChildPMem64Node;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *ToText;
   CHAR16                           *Str;
 
   DEBUG ((EFI_D_INFO, "PciBus: Resource Map for "));
@@ -309,19 +308,11 @@ DumpResourceMap (
       Bridge->BusNumber, Bridge->DeviceNumber, Bridge->FunctionNumber
       ));
   } else {
-    Status = gBS->LocateProtocol (
+    Str = ConvertDevicePathToText (
-                    &gEfiDevicePathToTextProtocolGuid,
-                    NULL,
-                    (VOID **) &ToText
-                    );
-    Str = NULL;
-    if (!EFI_ERROR (Status)) {
-      Str = ToText->ConvertDevicePathToText (
             DevicePathFromHandle (Bridge->Handle),
             FALSE,
             FALSE
             );
-    }
     DEBUG ((EFI_D_INFO, "Root Bridge %s\n", Str != NULL ? Str : L""));
     if (Str != NULL) {
       FreePool (Str);

MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c

@@ -1798,14 +1798,12 @@ DriverSampleInit (
   MY_EFI_VARSTORE_DATA            *VarStoreConfig;
   EFI_INPUT_KEY                   HotKey;
   EFI_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *PathToText;
 
   //
   // Initialize the local variables.
   //
   ConfigRequestHdr = NULL;
   NewString        = NULL;
-  PathToText       = NULL;
 
   //
   // Initialize screen dimensions for SendForm().
@@ -1923,17 +1921,10 @@ DriverSampleInit (
 
   PrivateData->HiiHandle[1] = HiiHandle[1];
 
-  Status = gBS->LocateProtocol (
-                  &gEfiDevicePathToTextProtocolGuid,
-                  NULL,
-                  (VOID **) &PathToText
-                  );
-  ASSERT_EFI_ERROR (Status);
-
   //
   // Update the device path string.
   //
-  NewString = PathToText->ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)&mHiiVendorDevicePath0, FALSE, FALSE);
+  NewString = ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)&mHiiVendorDevicePath0, FALSE, FALSE);
   if (HiiSetString (HiiHandle[0], STRING_TOKEN (STR_DEVICE_PATH), NewString, NULL) == 0) {
     DriverSampleUnload (ImageHandle);
     return EFI_OUT_OF_RESOURCES;

MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h

@@ -32,7 +32,6 @@ Revision History
 #include <Protocol/HiiDatabase.h>
 #include <Protocol/HiiString.h>
 #include <Protocol/FormBrowserEx.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Guid/MdeModuleHii.h>
 #include <Library/DebugLib.h>

MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf

@@ -55,6 +55,7 @@
   HiiLib
   PrintLib
   UefiLib
+  DevicePathLib
 
 [Guids]
   gEfiIfrTianoGuid                              ## CONSUMES ## Guid
@@ -70,7 +71,6 @@
   gEfiHiiDatabaseProtocolGuid                   ## CONSUMES
   gEfiSimpleTextInputExProtocolGuid             ## CONSUMES
   gEfiFormBrowserExProtocolGuid                 ## CONSUMES
-  gEfiDevicePathToTextProtocolGuid              ## CONSUMES
 
 [Depex]
   gEfiSimpleTextOutProtocolGuid AND gEfiHiiDatabaseProtocolGuid AND gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid

MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h

@@ -2,7 +2,7 @@
   Ihe internal heder file includes the required Protocol/Guid/Library
   and the shared function APIs.
 
-Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -29,7 +29,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/ComponentName2.h>
 #include <Protocol/ComponentName.h>
 #include <Protocol/DriverBinding.h>
-#include <Protocol/DevicePathToText.h>
 #include <Protocol/DevicePath.h>
 #include <Protocol/PlatformDriverOverride.h>
 #include <Guid/MdeModuleHii.h>

MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c

@@ -13,7 +13,7 @@
   4. It save all the mapping info in NV variables which will be consumed
      by platform override protocol driver to publish the platform override protocol.
 
-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -106,43 +106,27 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath = {
 /**
   Converting a given device to an unicode string.
 
-  This function will dependent on gEfiDevicePathToTextProtocolGuid, if protocol
-  does not installed, then return unknown device path L"?" directly.
-  
   @param    DevPath     Given device path instance
   
   @return   Converted string from given device path.
-  @retval   L"?"  Can not locate gEfiDevicePathToTextProtocolGuid protocol for converting.
+  @retval   L"?" Converting failed.
 **/
 CHAR16 *
 DevicePathToStr (
   IN EFI_DEVICE_PATH_PROTOCOL     *DevPath
   )
 {
-  EFI_STATUS                       Status;
+  CHAR16                          *Text;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText;
+  Text = ConvertDevicePathToText (
-  CHAR16                           *ToText;
-  
-  if (DevPath == NULL) {
-    return L"";
-  }
-    
-  Status = gBS->LocateProtocol (
-                  &gEfiDevicePathToTextProtocolGuid,
-                  NULL,
-                  (VOID **) &DevPathToText
-                  );
-  if (!EFI_ERROR (Status)) {
-    ToText = DevPathToText->ConvertDevicePathToText (
            DevPath,
            FALSE,
            TRUE
            );
-    ASSERT (ToText != NULL);
+  if (Text == NULL) {
-    return ToText;
+    return AllocateCopyPool (sizeof (L"?"), L"?");
+  } else {
+    return Text;
   }
-
-  return L"?";
 }
 
 /**

MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf

@@ -16,7 +16,7 @@
 #  4. It save all the mapping info in NV variables for the following boot, 
 #     which will be consumed by GetDriver API of the produced the platform override protocol.
 #
-# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -95,7 +95,6 @@
   gEfiFormBrowser2ProtocolGuid                  ## CONSUMED
   gEfiHiiConfigRoutingProtocolGuid              ## CONSUMED
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCED
-  gEfiDevicePathToTextProtocolGuid              ## CONSUMED
   gEfiPlatformDriverOverrideProtocolGuid        ## PRODUCED
 
 [Depex]

Nt32Pkg/Nt32Pkg.dsc

@@ -84,7 +84,7 @@
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
@@ -311,6 +311,7 @@
   MdeModulePkg/Core/Dxe/DxeMain.inf {
     <LibraryClasses>
       NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
     <BuildOptions>
       *_*_IA32_CC_FLAGS =
   }
@@ -363,7 +364,10 @@
     <LibraryClasses>
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
   }
-  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf {
+    <LibraryClasses>
+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  }
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

Nt32Pkg/Nt32Pkg.fdf

@@ -167,6 +167,7 @@ APRIORI PEI {
   INF  Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf
   }
 APRIORI DXE {
+  INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
   INF  Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
   }

OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c

@@ -1,7 +1,7 @@
 /** @file
   Platform BDS customizations.
 
-  Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -209,6 +209,7 @@ Returns:
   // Print Device Path
   //
   DevPathStr = DevicePathToStr(DevicePath);
+  if (DevPathStr != NULL) {
     DEBUG((
       EFI_D_INFO,
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",
@@ -217,6 +218,7 @@ Returns:
       DevPathStr
       ));
     FreePool(DevPathStr);
+  }
 
   BdsLibUpdateConsoleVariable (VarConsoleOut, DevicePath, NULL);
   BdsLibUpdateConsoleVariable (VarConsoleInp, DevicePath, NULL);
@@ -236,6 +238,7 @@ Returns:
   // Print Device Path
   //
   DevPathStr = DevicePathToStr(DevicePath);
+  if (DevPathStr != NULL) {
     DEBUG((
       EFI_D_INFO,
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",
@@ -244,6 +247,7 @@ Returns:
       DevPathStr
       ));
     FreePool(DevPathStr);
+  }
 
   BdsLibUpdateConsoleVariable (VarConsoleOut, DevicePath, NULL);
   BdsLibUpdateConsoleVariable (VarConsoleInp, DevicePath, NULL);
@@ -799,12 +803,14 @@ ConnectRecursivelyIfPciMassStorage (
     // Print Device Path
     //
     DevPathStr = DevicePathToStr (DevicePath);
+    if (DevPathStr != NULL) {
       DEBUG((
         EFI_D_INFO,
         "Found Mass Storage device: %s\n",
         DevPathStr
         ));
       FreePool(DevPathStr);
+    }
 
     Status = gBS->ConnectController (Handle, NULL, NULL, TRUE);
     if (EFI_ERROR (Status)) {

OvmfPkg/Library/PlatformBdsLib/QemuBootOrder.c

@@ -1,7 +1,7 @@
 /** @file
   Rewrite the BootOrder NvVar based on QEMU's "bootorder" fw_cfg file.
 
-  Copyright (C) 2012, Red Hat, Inc.
+  Copyright (C) 2012 - 2013, Red Hat, Inc.
 
   This program and the accompanying materials are licensed and made available
   under the terms and conditions of the BSD License which accompanies this
@@ -20,7 +20,7 @@
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/BaseLib.h>
 #include <Library/PrintLib.h>
-#include <Protocol/DevicePathToText.h>
+#include <Library/DevicePathLib.h>
 #include <Guid/GlobalVariable.h>
 
 
@@ -866,14 +866,13 @@ BOOLEAN
 Match (
   IN  CONST CHAR16                           *Translated,
   IN  UINTN                                  TranslatedLength,
-  IN  CONST EFI_DEVICE_PATH_PROTOCOL         *DevicePath,
+  IN  CONST EFI_DEVICE_PATH_PROTOCOL         *DevicePath
-  IN  CONST EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText
   )
 {
   CHAR16  *Converted;
   BOOLEAN Result;
 
-  Converted = DevPathToText->ConvertDevicePathToText (
+  Converted = ConvertDevicePathToText (
                 DevicePath,
                 FALSE, // DisplayOnly
                 FALSE  // AllowShortcuts
@@ -933,9 +932,6 @@ SetBootOrderFromQemu (
   )
 {
   RETURN_STATUS                    Status;
-
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText;
-
   FIRMWARE_CONFIG_ITEM             FwCfgItem;
   UINTN                            FwCfgSize;
   CHAR8                            *FwCfg;
@@ -946,15 +942,6 @@ SetBootOrderFromQemu (
   UINTN                            TranslatedSize;
   CHAR16                           Translated[TRANSLATION_OUTPUT_SIZE];
 
-  Status = gBS->LocateProtocol (
-                  &gEfiDevicePathToTextProtocolGuid,
-                  NULL, // optional registration key
-                  (VOID **) &DevPathToText
-                  );
-  if (Status != EFI_SUCCESS) {
-    return Status;
-  }
-
   Status = QemuFwCfgFindFile ("bootorder", &FwCfgItem, &FwCfgSize);
   if (Status != RETURN_SUCCESS) {
     return Status;
@@ -1019,8 +1006,7 @@ SetBootOrderFromQemu (
             Match (
               Translated,
               TranslatedSize, // contains length, not size, in CHAR16's here
-              BootOption->DevicePath,
+              BootOption->DevicePath
-              DevPathToText
               )
             ) {
           //

OvmfPkg/OvmfPkgIa32X64.dsc

@@ -1,7 +1,7 @@
 ## @file
 #  EFI/Framework Open Virtual Machine Firmware (OVMF) platform
 #
-#  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -90,7 +90,7 @@
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf
   FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
@@ -370,6 +370,7 @@
   MdeModulePkg/Core/Dxe/DxeMain.inf {
     <LibraryClasses>
       NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
   }
 
   IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
@@ -431,7 +432,11 @@
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf {
+    <LibraryClasses>
+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
+  }
   MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

OvmfPkg/OvmfPkgIa32X64.fdf

@@ -1,7 +1,7 @@
 ## @file
 #  Open Virtual Machine Firmware: FDF
 #
-#  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -155,6 +155,7 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 
 APRIORI DXE {
+  INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 }
 

OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf

@@ -4,7 +4,7 @@
 # Need custom SecureBootConfigDxe for OVMF that does not force
 # resets after PK changes since OVMF doesn't have persistent variables
 #
-# Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution. The full text of the license may be found at
@@ -57,6 +57,7 @@
   DebugLib
   HiiLib
   PlatformSecureLib
+  DevicePathLib
 
 [Guids]
   gEfiIfrTianoGuid
@@ -72,21 +73,7 @@
   gEfiImageSecurityDatabaseGuid                 ## CONSUMES
   gEfiFileSystemVolumeLabelInfoIdGuid           ## CONSUMES
   gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid
-  gEfiVT100PlusGuid                             ## CONSUMES ## GUID (The type of terminal)
-  gEfiVT100Guid                                 ## CONSUMES ## GUID (The type of terminal)
-                                                ## CONSUMES ## GUID HOB (The hob holding memory type information)
-  gEfiVTUTF8Guid                                ## CONSUMES ## GUID (The type of terminal)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"BootXX" (Boot option variable)
-                                                ## CONSUMES           ## Variable:L"Timeout" (The time out value in second of showing progress bar)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"BootOrder" (The boot option array)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"DriverOrder" (The driver order list)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ConIn" (The device path of console in device)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ConOut" (The device path of console out device)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" (The device path of error out device)
   gEfiFileInfoGuid                              ## CONSUMES ## GUID
-  gEfiPcAnsiGuid                                ## CONSUMES ## GUID (The type of terminal)
-  gEfiUartDevicePathGuid                        ## CONSUMES ## GUID (Identify the device path for UARD device)
-  gEfiSasDevicePathGuid                         ## CONSUMES ## GUID (Identify the device path for SAS device)
 
 [Protocols]
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES
@@ -95,8 +82,6 @@
   gEfiLoadFileProtocolGuid                      ## PROTOCOL CONSUMES
   gEfiBlockIoProtocolGuid                       ## PROTOCOL CONSUMES
   gEfiDevicePathProtocolGuid                    ## PROTOCOL CONSUMES
-  gEfiDevicePathToTextProtocolGuid
-  gEfiDebugPortProtocolGuid
 
 [Depex]
   gEfiHiiConfigRoutingProtocolGuid  AND

OvmfPkg/SecureBootConfigDxe/SecureBootConfigImpl.h

@@ -2,7 +2,7 @@
   The header file of HII Config Access protocol implementation of SecureBoot
   configuration module.
 
-Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -23,7 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/SimpleFileSystem.h>
 #include <Protocol/BlockIo.h>
 #include <Protocol/DevicePath.h>
-#include <Protocol/DevicePathToText.h>
 #include <Protocol/DebugPort.h>
 #include <Protocol/LoadFile.h>
 

PerformancePkg/Dp_App/Dp.inf

@@ -1,7 +1,7 @@
 ##  @file
 #  Display Performance Application, Module information file.
 #
-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
@@ -66,7 +66,6 @@
   gEfiDriverBindingProtocolGuid                           # SOMETIMES_CONSUMED
   gEfiComponentName2ProtocolGuid                          # SOMETIMES_CONSUMED
   gEfiLoadedImageDevicePathProtocolGuid                   # SOMETIMES_CONSUMED
-  gEfiDevicePathToTextProtocolGuid                        # SOMETIMES_CONSUMED
 
 [Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize

PerformancePkg/Dp_App/DpUtilities.c

@@ -1,7 +1,7 @@
 /** @file
   Utility functions used by the Dp application.
 
-  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -31,7 +31,6 @@
 #include <Protocol/DriverBinding.h>
 #include <Protocol/ComponentName2.h>
 #include <Protocol/DevicePath.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Guid/Performance.h>
 
@@ -220,7 +219,6 @@ GetNameFromHandle (
   UINTN                       StringSize;
   CHAR8                       *PlatformLanguage;
   EFI_COMPONENT_NAME2_PROTOCOL      *ComponentName2;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevicePathToText;
 
   //
   // Method 1: Get the name string from image PDB
@@ -336,13 +334,7 @@ GetNameFromHandle (
       //
       // Method 5: Get the name string from image DevicePath
       //
-      Status = gBS->LocateProtocol (
+      NameString = ConvertDevicePathToText (LoadedImageDevicePath, TRUE, FALSE);
-                      &gEfiDevicePathToTextProtocolGuid,
-                      NULL,
-                      (VOID **) &DevicePathToText
-                      );
-      if (!EFI_ERROR (Status)) {
-        NameString = DevicePathToText->ConvertDevicePathToText (LoadedImageDevicePath, TRUE, FALSE);
       if (NameString != NULL) {
         StrnCpy (mGaugeString, NameString, DP_GAUGE_STRING_LENGTH);
         mGaugeString[DP_GAUGE_STRING_LENGTH] = 0;
@@ -351,7 +343,6 @@ GetNameFromHandle (
       }
     }
   }
-  }
 
   //
   // Method 6: Unknown Driver Name

PerformancePkg/PerformancePkg.dsc

@@ -41,7 +41,7 @@
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf  
-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c

@@ -31,7 +31,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/TcgService.h>
 #include <Protocol/BlockIo.h>
 #include <Protocol/DiskIo.h>
-#include <Protocol/DevicePathToText.h>
 #include <Protocol/FirmwareVolumeBlock.h>
 
 #include <Guid/MeasuredFvHob.h>
@@ -940,21 +939,14 @@ DxeTpmMeasureBootHandler (
     //    
     DEBUG_CODE_BEGIN ();
       CHAR16                            *ToText;
-      EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevPathToText;
+      ToText = ConvertDevicePathToText (
-      Status = gBS->LocateProtocol (
-                      &gEfiDevicePathToTextProtocolGuid,
-                      NULL,
-                      (VOID **) &DevPathToText
-                      );
-      if (!EFI_ERROR (Status)) {
-        ToText = DevPathToText->ConvertDevicePathToText (
                  DevicePathNode,
                  FALSE,
                  TRUE
                  );
       if (ToText != NULL) {
         DEBUG ((DEBUG_INFO, "The measured image path is %s.\n", ToText));
-        }
+        FreePool (ToText);
       }
     DEBUG_CODE_END ();
 

SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf

@@ -6,7 +6,7 @@
 #  This external input must be validated carefully to avoid security issue like
 #  buffer overflow, integer overflow.
 #
-# Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution. The full text of the license may be found at
@@ -60,4 +60,4 @@
   gEfiFirmwareVolumeBlockProtocolGuid   ## CONSUMES
   gEfiBlockIoProtocolGuid               ## CONSUMES
   gEfiDiskIoProtocolGuid                ## CONSUMES
-  gEfiDevicePathToTextProtocolGuid      ## SOMETIMES_CONSUMES (Only used in debug mode)
+

SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c

@@ -1,7 +1,7 @@
 /** @file
   The functions for access policy modification.
     
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD License 
 which accompanies this distribution.  The full text of the license may be found at 
@@ -229,23 +229,9 @@ AddDevicePath (
   IN     VOID                                   *OpCodeHandle
   )
 {
-  EFI_STATUS                        Status;
   EFI_DEVICE_PATH_PROTOCOL          *Next;
   EFI_STRING_ID                     NameID;
   EFI_STRING                        DriverName;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevicePathText;
-
-  //
-  // Locate device path to text protocol.
-  //
-  Status = gBS->LocateProtocol (
-                  &gEfiDevicePathToTextProtocolGuid,
-                  NULL,
-                  (VOID **) &DevicePathText
-                  );
-  if (EFI_ERROR (Status)) {
-    return ;
-  }
 
   //
   // Get driver file name node.
@@ -259,7 +245,7 @@ AddDevicePath (
   //
   // Display the device path in form.
   //
-  DriverName = DevicePathText->ConvertDevicePathToText (DevicePath, FALSE, FALSE);
+  DriverName = ConvertDevicePathToText (DevicePath, FALSE, FALSE);
   NameID = HiiSetString (mCallbackInfo->HiiHandle, 0, DriverName, NULL);
   FreePool (DriverName);
   if (NameID == 0) {

SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h

@@ -1,7 +1,7 @@
 /** @file
   The header file for user profile manager driver.
     
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials 
 are licensed and made available under the terms and conditions of the BSD License 
 which accompanies this distribution.  The full text of the license may be found at 
@@ -21,7 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/MdeModuleHii.h>
 
 #include <Protocol/HiiConfigAccess.h>
-#include <Protocol/DevicePathToText.h>
 #include <Protocol/UserCredential2.h>
 #include <Protocol/UserManager.h>
 

SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf

@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for user profile manager driver.
 #
-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution. The full text of the license may be found at
@@ -45,6 +45,7 @@
   DebugLib
   HiiLib
   UefiLib
+  DevicePathLib
   
   [Guids]
   gEfiIfrTianoGuid                              ## CONSUMES ## Guid
@@ -58,7 +59,6 @@
   gEfiHiiConfigAccessProtocolGuid
   gEfiUserCredential2ProtocolGuid
   gEfiUserManagerProtocolGuid
-  gEfiDevicePathToTextProtocolGuid
 
 [Depex]
   gEfiUserManagerProtocolGuid

SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

@@ -1,7 +1,7 @@
 ## @file
 #  Component name for SecureBoot configuration module.
 #
-# Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution. The full text of the license may be found at
@@ -54,6 +54,7 @@
   DebugLib
   HiiLib
   PlatformSecureLib
+  DevicePathLib
 
 [Guids]
   gEfiIfrTianoGuid
@@ -69,21 +70,7 @@
   gEfiImageSecurityDatabaseGuid                 ## CONSUMES
   gEfiFileSystemVolumeLabelInfoIdGuid           ## CONSUMES
   gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid
-  gEfiVT100PlusGuid                             ## CONSUMES ## GUID (The type of terminal)
-  gEfiVT100Guid                                 ## CONSUMES ## GUID (The type of terminal)
-                                                ## CONSUMES ## GUID HOB (The hob holding memory type information)
-  gEfiVTUTF8Guid                                ## CONSUMES ## GUID (The type of terminal)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"BootXX" (Boot option variable)
-                                                ## CONSUMES           ## Variable:L"Timeout" (The time out value in second of showing progress bar)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"BootOrder" (The boot option array)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"DriverOrder" (The driver order list)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ConIn" (The device path of console in device)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ConOut" (The device path of console out device)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" (The device path of error out device)
   gEfiFileInfoGuid                              ## CONSUMES ## GUID
-  gEfiPcAnsiGuid                                ## CONSUMES ## GUID (The type of terminal)
-  gEfiUartDevicePathGuid                        ## CONSUMES ## GUID (Identify the device path for UARD device)
-  gEfiSasDevicePathGuid                         ## CONSUMES ## GUID (Identify the device path for SAS device)
 
 [Protocols]
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES
@@ -92,8 +79,6 @@
   gEfiLoadFileProtocolGuid                      ## PROTOCOL CONSUMES
   gEfiBlockIoProtocolGuid                       ## PROTOCOL CONSUMES
   gEfiDevicePathProtocolGuid                    ## PROTOCOL CONSUMES
-  gEfiDevicePathToTextProtocolGuid
-  gEfiDebugPortProtocolGuid
 
 [Depex]
   gEfiHiiConfigRoutingProtocolGuid  AND

SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h

@@ -23,7 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/SimpleFileSystem.h>
 #include <Protocol/BlockIo.h>
 #include <Protocol/DevicePath.h>
-#include <Protocol/DevicePathToText.h>
 #include <Protocol/DebugPort.h>
 #include <Protocol/LoadFile.h>
 

ShellPkg/Application/Shell/Shell.inf

@@ -1,7 +1,7 @@
 ##  @file
 #  This is the shell application
 #
-#  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -93,7 +93,6 @@
   gEfiComponentName2ProtocolGuid                          # ALWAYS_CONSUMED
   gEfiUnicodeCollation2ProtocolGuid                       # ALWAYS_CONSUMED
   gEfiDevicePathProtocolGuid                              # ALWAYS_CONSUMED
-  gEfiDevicePathToTextProtocolGuid                        # ALWAYS_CONSUMED
 
 [Pcd]
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         # ALWAYS_CONSUMED

ShellPkg/Application/Shell/ShellProtocol.c

@@ -115,27 +115,18 @@ InternalShellProtocolDebugPrintMessage (
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
   )
 {
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevicePathToText;
   EFI_STATUS                        Status;
   CHAR16                            *Temp;
 
-  Status = EFI_SUCCESS;
   DEBUG_CODE_BEGIN();
-  DevicePathToText = NULL;
 
-  Status = gBS->LocateProtocol(&gEfiDevicePathToTextProtocolGuid,
-                               NULL,
-                               (VOID**)&DevicePathToText);
   if (Mapping != NULL) {
     DEBUG((EFI_D_INFO, "Added new map item:\"%S\"\r\n", Mapping));
   }
-  if (!EFI_ERROR(Status)) {
+  Temp = ConvertDevicePathToText(DevicePath, TRUE, TRUE);
-    if (DevicePath != NULL) {
-      Temp = DevicePathToText->ConvertDevicePathToText(DevicePath, TRUE, TRUE);
   DEBUG((EFI_D_INFO, "DevicePath: %S\r\n", Temp));
   FreePool(Temp);
-    }
+
-  }
   DEBUG_CODE_END();
   return (Status);
 }
@@ -647,7 +638,6 @@ EfiShellGetDeviceName(
 {
   EFI_STATUS                        Status;
   EFI_COMPONENT_NAME2_PROTOCOL      *CompName2;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevicePathToText;
   EFI_DEVICE_PATH_PROTOCOL          *DevicePath;
   EFI_HANDLE                        *HandleList;
   UINTN                             HandleCount;
@@ -815,14 +805,6 @@ EfiShellGetDeviceName(
     }
   }
   if ((Flags & EFI_DEVICE_NAME_USE_DEVICE_PATH) != 0) {
-    Status = gBS->LocateProtocol(
-      &gEfiDevicePathToTextProtocolGuid,
-      NULL,
-      (VOID**)&DevicePathToText);
-    //
-    // we now have the device path to text protocol
-    //
-    if (!EFI_ERROR(Status)) {
     Status = gBS->OpenProtocol(
       DeviceHandle,
       &gEfiDevicePathProtocolGuid,
@@ -834,11 +816,10 @@ EfiShellGetDeviceName(
       //
       // use device path to text on the device path
       //
-        *BestDeviceName = DevicePathToText->ConvertDevicePathToText(DevicePath, TRUE, TRUE);
+      *BestDeviceName = ConvertDevicePathToText(DevicePath, TRUE, TRUE);
       return (EFI_SUCCESS);
     }
   }
-  }
   //
   // none of the selected bits worked.
   //
@@ -1583,11 +1564,11 @@ EfiShellExecute(
   DevPath = AppendDevicePath (ShellInfoObject.ImageDevPath, ShellInfoObject.FileDevPath);
 
   DEBUG_CODE_BEGIN();
-  Temp = gDevPathToText->ConvertDevicePathToText(ShellInfoObject.FileDevPath, TRUE, TRUE);
+  Temp = ConvertDevicePathToText(ShellInfoObject.FileDevPath, TRUE, TRUE);
   FreePool(Temp);
-  Temp = gDevPathToText->ConvertDevicePathToText(ShellInfoObject.ImageDevPath, TRUE, TRUE);
+  Temp = ConvertDevicePathToText(ShellInfoObject.ImageDevPath, TRUE, TRUE);
   FreePool(Temp);
-  Temp = gDevPathToText->ConvertDevicePathToText(DevPath, TRUE, TRUE);
+  Temp = ConvertDevicePathToText(DevPath, TRUE, TRUE);
   FreePool(Temp);
   DEBUG_CODE_END();
 

ShellPkg/Include/Library/ShellCommandLib.h

@@ -4,7 +4,7 @@
   This library is for use ONLY by shell commands linked into the shell application.
   This library will not funciton if it is used for UEFI Shell 2.0 Applications.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -24,7 +24,6 @@
 #include <Protocol/EfiShell.h>
 #include <Protocol/EfiShellParameters.h>
 #include <Protocol/UnicodeCollation.h>
-#include <Protocol/DevicePathToText.h>
 #include <Protocol/SimpleFileSystem.h>
 
 #include <Library/UefiBootServicesTableLib.h>
@@ -33,7 +32,6 @@
 // The extern global protocol poionters.
 //
 extern        EFI_UNICODE_COLLATION_PROTOCOL    *gUnicodeCollation;
-extern        EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *gDevPathToText;
 extern        CONST CHAR16*                     SupportLevel[];
 
 //

ShellPkg/Library/UefiDpLib/DpUtilities.c

@@ -31,7 +31,6 @@
 #include <Protocol/DriverBinding.h>
 #include <Protocol/ComponentName2.h>
 #include <Protocol/DevicePath.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Guid/Performance.h>
 
@@ -204,7 +203,6 @@ GetNameFromHandle (
   UINTN                       StringSize;
   CHAR8                       *PlatformLanguage;
   EFI_COMPONENT_NAME2_PROTOCOL      *ComponentName2;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevicePathToText;
 
   //
   // Method 1: Get the name string from image PDB
@@ -320,13 +318,7 @@ GetNameFromHandle (
       //
       // Method 5: Get the name string from image DevicePath
       //
-      Status = gBS->LocateProtocol (
+      NameString = ConvertDevicePathToText (LoadedImageDevicePath, TRUE, FALSE);
-                      &gEfiDevicePathToTextProtocolGuid,
-                      NULL,
-                      (VOID **) &DevicePathToText
-                      );
-      if (!EFI_ERROR (Status)) {
-        NameString = DevicePathToText->ConvertDevicePathToText (LoadedImageDevicePath, TRUE, FALSE);
       if (NameString != NULL) {
         StrnCpy (mGaugeString, NameString, DP_GAUGE_STRING_LENGTH);
         mGaugeString[DP_GAUGE_STRING_LENGTH] = 0;
@@ -335,7 +327,6 @@ GetNameFromHandle (
       }
     }
   }
-  }
 
   //
   // Method 6: Unknown Driver Name

ShellPkg/Library/UefiDpLib/UefiDpLib.h

@@ -25,7 +25,6 @@ extern EFI_GUID gDpHiiGuid;
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>

ShellPkg/Library/UefiDpLib/UefiDpLib.inf

@@ -62,13 +62,13 @@
   UefiBootServicesTableLib
   SortLib
   PrintLib
+  DevicePathLib
 
 [Protocols]
   gEfiLoadedImageProtocolGuid                             # ALWAYS_CONSUMED
   gEfiDriverBindingProtocolGuid                           # SOMETIMES_CONSUMED
   gEfiComponentName2ProtocolGuid                          # SOMETIMES_CONSUMED
   gEfiLoadedImageDevicePathProtocolGuid                   # SOMETIMES_CONSUMED
-  gEfiDevicePathToTextProtocolGuid                        # SOMETIMES_CONSUMED
 
 [Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize

ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c

@@ -414,20 +414,16 @@ DevicePathProtocolDumpInformation(
   CHAR16                            *Temp;
   CHAR16                            *Temp2;
   EFI_STATUS                        Status;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevPathToText;
   Temp = NULL;
 
-  Status = gBS->LocateProtocol(&gEfiDevicePathToTextProtocolGuid, NULL, (VOID**)&DevPathToText);
-  if (!EFI_ERROR(Status)) {
   Status = gBS->OpenProtocol(TheHandle, &gEfiDevicePathProtocolGuid, (VOID**)&DevPath, gImageHandle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);
   if (!EFI_ERROR(Status)) {
     //
     // I cannot decide whether to allow shortcuts here (the second BOOLEAN on the next line)
     //
-      Temp = DevPathToText->ConvertDevicePathToText(DevPath, TRUE, TRUE);
+    Temp = ConvertDevicePathToText(DevPath, TRUE, TRUE);
     gBS->CloseProtocol(TheHandle, &gEfiDevicePathProtocolGuid, gImageHandle, NULL);
   }
-  }
   if (!Verbose && Temp != NULL && StrLen(Temp) > 30) {
     Temp2 = NULL;
     Temp2 = StrnCatGrow(&Temp2, NULL, Temp+(StrLen(Temp) - 30), 30);

ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c

@@ -30,7 +30,6 @@ STATIC BUFFER_LIST                        mFileHandleList;
 
 // global variables required by library class.
 EFI_UNICODE_COLLATION_PROTOCOL    *gUnicodeCollation            = NULL;
-EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *gDevPathToText               = NULL;
 SHELL_MAP_LIST                    gShellMapList;
 SHELL_MAP_LIST                    *gShellCurDir                 = NULL;
 
@@ -58,12 +57,6 @@ CommandInit(
       return (EFI_DEVICE_ERROR);
     }
   }
-  if (gDevPathToText == NULL) {
-    Status = gBS->LocateProtocol(&gEfiDevicePathToTextProtocolGuid, NULL, (VOID**)&gDevPathToText);
-    if (EFI_ERROR(Status)) {
-      return (EFI_DEVICE_ERROR);
-    }
-  }
   return (EFI_SUCCESS);
 }
 
@@ -184,7 +177,6 @@ ShellCommandLibDestructor (
   }
 
   gUnicodeCollation            = NULL;
-  gDevPathToText               = NULL;
   gShellCurDir                 = NULL;
 
   return (RETURN_SUCCESS);

ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

@@ -1,7 +1,7 @@
 ##  @file
 #  Provides interface to shell internal functions for shell commands.
 #
-#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved. <BR>
+#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved. <BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -52,7 +52,6 @@
   gEfiUnicodeCollation2ProtocolGuid                       # ALWAYS_CONSUMED
   gEfiShellProtocolGuid                                   # ALWAYS_CONSUMED
   gEfiShellParametersProtocolGuid                         # ALWAYS_CONSUMED
-  gEfiDevicePathToTextProtocolGuid                        # ALWAYS_CONSUMED
 
 [Guids]
   gEfiSasDevicePathGuid                                   # ALWAYS_CONSUMED

ShellPkg/Library/UefiShellDebug1CommandsLib/Bcfg.c

@@ -1,7 +1,7 @@
 /** @file
   Main file for bcfg shell Debug1 function.
 
-  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -1052,7 +1052,7 @@ BcfgDisplayDumpDebug1(
     if ((*(UINT16*)(Buffer+4)) != 0) {
       DevPath = AllocateZeroPool(*(UINT16*)(Buffer+4));
       CopyMem(DevPath, Buffer+6+StrSize((CHAR16*)(Buffer+6)), *(UINT16*)(Buffer+4));
-      DevPathString = gDevPathToText->ConvertDevicePathToText(DevPath, TRUE, FALSE);
+      DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE);
     } else {
       DevPath       = NULL;
       DevPathString = NULL;

ShellPkg/Library/UefiShellDebug1CommandsLib/SetVar.c

@@ -1,7 +1,7 @@
 /** @file
   Main file for SetVar shell Debug1 function.
 
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -49,7 +49,6 @@ ShellCommandRunSetVar (
   UINTN               Size;
   UINTN               LoopVar;
   EFI_DEVICE_PATH_PROTOCOL           *DevPath;
-  EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *DevPathFromText;
 
   ShellStatus         = SHELL_SUCCESS;
   Status              = EFI_SUCCESS;
@@ -226,9 +225,7 @@ ShellCommandRunSetVar (
           //
           Data++;
           Data++;
-          Status = gBS->LocateProtocol(&gEfiDevicePathFromTextProtocolGuid, NULL, (VOID**)&DevPathFromText);
+          DevPath = ConvertTextToDevicePath(Data);
-          ASSERT_EFI_ERROR(Status);
-          DevPath = DevPathFromText->ConvertTextToDevicePath(Data);
           if (DevPath == NULL) {
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SETVAR_ERROR_DPFT), gShellDebug1HiiHandle, Status);
             ShellStatus = SHELL_INVALID_PARAMETER;

ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h

@@ -1,7 +1,7 @@
 /** @file
   Main file for NULL named library for Profile1 shell command functions.
 
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -29,7 +29,6 @@
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
-#include <Protocol/DevicePathToText.h>
 #include <Protocol/DriverDiagnostics2.h>
 #include <Protocol/DriverDiagnostics.h>
 #include <Protocol/PlatformDriverOverride.h>
@@ -38,7 +37,6 @@
 #include <Protocol/DriverSupportedEfiVersion.h>
 #include <Protocol/DriverFamilyOverride.h>
 #include <Protocol/DriverHealth.h>
-#include <Protocol/DevicePathFromText.h>
 #include <Protocol/SimplePointer.h>
 #include <Protocol/PciRootBridgeIo.h>
 

ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c

@@ -1,7 +1,7 @@
 /** @file
   Main file for Dh shell Driver1 function.
 
-  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -260,7 +260,7 @@ GetDriverImageName (
     return (Status);
   }
   DevicePath = LoadedImage->FilePath;
-  *Name = gDevPathToText->ConvertDevicePathToText(DevicePath, TRUE, TRUE);
+  *Name = ConvertDevicePathToText(DevicePath, TRUE, TRUE);
   return (EFI_SUCCESS);
 }
 
@@ -354,7 +354,7 @@ DisplayDriverModelHandle (
     ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DH_OUTPUT_DRIVER1), gShellDriver1HiiHandle, TempStringPointer!=NULL?TempStringPointer:L"<Unknown>");
     SHELL_FREE_NON_NULL(TempStringPointer);
   
-    TempStringPointer = gDevPathToText->ConvertDevicePathToText(DevicePath, TRUE, FALSE);
+    TempStringPointer = ConvertDevicePathToText(DevicePath, TRUE, FALSE);
     ShellPrintHiiEx(
       -1, 
       -1, 

ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c

@@ -1,7 +1,7 @@
 /** @file
   Main file for Drivers shell Driver1 function.
 
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -80,7 +80,7 @@ GetDevicePathTextForHandle(
   }
   RetVal = gEfiShellProtocol->GetFilePathFromDevicePath(FinalPath);
   if (RetVal == NULL) {
-    RetVal = gDevPathToText->ConvertDevicePathToText(FinalPath, TRUE, TRUE);
+    RetVal = ConvertDevicePathToText(FinalPath, TRUE, TRUE);
   }
   FreePool(FinalPath);
   return (RetVal);

ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c

@@ -1,7 +1,7 @@
 /** @file
   Main file for DrvCfg shell Driver1 function.
 
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -406,7 +406,7 @@ ConfigFromFile(
                 //
                 // print out an error.
                 //
-                TempDevPathString = gDevPathToText->ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), TRUE, TRUE);
+                TempDevPathString = ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)(((CHAR8*)PackageHeader) + sizeof(EFI_HII_PACKAGE_HEADER)), TRUE, TRUE);
                 ShellPrintHiiEx(
                   -1, 
                   -1, 

ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h

@@ -1,7 +1,7 @@
 /** @file
   Main file for NULL named library for Profile1 shell command functions.
 
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -28,7 +28,6 @@
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
-#include <Protocol/DevicePathToText.h>
 #include <Protocol/DriverDiagnostics2.h>
 #include <Protocol/DriverDiagnostics.h>
 #include <Protocol/PlatformDriverOverride.h>

ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c

@@ -1,7 +1,7 @@
 /** @file
   Main file for Unload shell Driver1 function.
 
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -67,7 +67,6 @@ DumpLoadedImageProtocolInfo (
 {
   EFI_LOADED_IMAGE_PROTOCOL         *Image;
   EFI_STATUS                        Status;
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevicePathToText;
   CHAR16                            *DevicePathText;
   CHAR16                            *CodeTypeText;
   CHAR16                            *DataTypeText;
@@ -79,20 +78,7 @@ DumpLoadedImageProtocolInfo (
   if (EFI_ERROR(Status)) {
     return (EFI_INVALID_PARAMETER);
   }
-
+  DevicePathText = ConvertDevicePathToText(Image->FilePath, TRUE, TRUE);
-  Status = gBS->LocateProtocol(
-    &gEfiDevicePathToTextProtocolGuid,
-    NULL,
-    (VOID**)&DevicePathToText);
-  //
-  // we now have the device path to text protocol
-  //
-  if (!EFI_ERROR(Status)) {
-    DevicePathText = DevicePathToText->ConvertDevicePathToText(Image->FilePath, TRUE, TRUE);
-  } else {
-    DevicePathText = NULL;
-  }
-
   CodeTypeText   = ConvertMemoryType(Image->ImageCodeType);
   DataTypeText   = ConvertMemoryType(Image->ImageDataType);
   PdbPointer     = (CHAR8*)PeCoffLoaderGetPdbPointer(Image->ImageBase);

ShellPkg/Library/UefiShellInstall1CommandsLib/Bcfg.c

@@ -1050,7 +1050,7 @@ BcfgDisplayDumpInstall1(
     if ((*(UINT16*)(Buffer+4)) != 0) {
       DevPath = AllocateZeroPool(*(UINT16*)(Buffer+4));
       CopyMem(DevPath, Buffer+6+StrSize((CHAR16*)(Buffer+6)), *(UINT16*)(Buffer+4));
-      DevPathString = gDevPathToText->ConvertDevicePathToText(DevPath, TRUE, FALSE);
+      DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE);
     } else {
       DevPath       = NULL;
       DevPathString = NULL;

ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.h

@@ -1,7 +1,7 @@
 /** @file
   Main file for NULL named library for install 1 shell command functions.
 
-  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -25,7 +25,6 @@
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>

ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h

@@ -1,7 +1,7 @@
 /** @file
   Main file for NULL named library for level 1 shell command functions.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -25,7 +25,6 @@
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>

ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c

@@ -421,7 +421,7 @@ PerformSingleMappingDisplay(
   if (TempSpot != NULL) {
     *TempSpot = CHAR_NULL;
   }
-  DevPathString = gDevPathToText->ConvertDevicePathToText(DevPath, TRUE, FALSE);
+  DevPathString = ConvertDevicePathToText(DevPath, TRUE, FALSE);
   if (!SFO) {
     TempLen = StrLen(CurrentName);
     ShellPrintHiiEx (

ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.h

@@ -9,7 +9,7 @@
   * functions are non-interactive only
 
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -33,7 +33,6 @@
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>

ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf

@@ -1,7 +1,7 @@
 ##  @file
 # Provides shell level 2 functions
 #
-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved. <BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -65,6 +65,7 @@
   HiiLib
   HandleParsingLib
   PathLib
+  DevicePathLib
 
 [Protocols]
   gEfiUnicodeCollation2ProtocolGuid                       # ALWAYS_CONSUMED
@@ -73,7 +74,6 @@
   gEfiDevicePathProtocolGuid                              # ALWAYS_CONSUMED
   gEfiLoadedImageProtocolGuid                             # ALWAYS_CONSUMED
   gEfiSimpleFileSystemProtocolGuid                        # ALWAYS_CONSUMED
-  gEfiDevicePathToTextProtocolGuid                        # ALWAYS_CONSUMED
 
 [Pcd.common]
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         # ALWAYS_CONSUMED

ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.h

@@ -25,7 +25,6 @@
 #include <Protocol/DevicePath.h>
 #include <Protocol/LoadedImage.h>
 #include <Protocol/UnicodeCollation.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>

ShellPkg/Library/UefiSortLib/UefiSortLib.c

@@ -17,7 +17,6 @@
 
 #include <Protocol/UnicodeCollation.h>
 #include <Protocol/DevicePath.h>
-#include <Protocol/DevicePathToText.h>
 
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/BaseLib.h>
@@ -25,8 +24,8 @@
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/SortLib.h>
+#include <Library/DevicePathLib.h>
 
-STATIC EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *mDevicePathToText = NULL;
 STATIC EFI_UNICODE_COLLATION_PROTOCOL   *mUnicodeCollation = NULL;
 
 
@@ -224,15 +223,6 @@ DevicePathCompare (
     return 1;
   }
 
-  if (mDevicePathToText == NULL) {
-    Status = gBS->LocateProtocol(
-      &gEfiDevicePathToTextProtocolGuid,
-      NULL,
-      (VOID**)&mDevicePathToText);
-
-    ASSERT_EFI_ERROR(Status);
-  }
-
   if (mUnicodeCollation == NULL) {
     Status = gBS->LocateProtocol(
       &gEfiUnicodeCollation2ProtocolGuid,
@@ -242,12 +232,12 @@ DevicePathCompare (
     ASSERT_EFI_ERROR(Status);
   }
 
-  TextPath1 = mDevicePathToText->ConvertDevicePathToText(
+  TextPath1 = ConvertDevicePathToText(
     DevicePath1,
     FALSE,
     FALSE);
 
-  TextPath2 = mDevicePathToText->ConvertDevicePathToText(
+  TextPath2 = ConvertDevicePathToText(
     DevicePath2,
     FALSE,
     FALSE);

ShellPkg/Library/UefiSortLib/UefiSortLib.inf

@@ -1,7 +1,7 @@
 ##  @file
 #   Library used for sorting routines.
 #
-#  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved. <BR>
+#  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved. <BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -38,9 +38,9 @@
   BaseMemoryLib
   DebugLib
   UefiBootServicesTableLib
+  DevicePathLib
 
 [Protocols]
   gEfiUnicodeCollation2ProtocolGuid                       # ALWAYS_CONSUMED
   gEfiDevicePathProtocolGuid                              # ALWAYS_CONSUMED
-  gEfiDevicePathToTextProtocolGuid                        # ALWAYS_CONSUMED
 

ShellPkg/ShellPkg.dsc

@@ -26,7 +26,7 @@
 [LibraryClasses.common]
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf
   DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf  
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf