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

5 files changed, 13 insertions, 28 deletions

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
index 9947c56117..bfbd8d76b0 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
+++ b/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, 

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
index 1f7675b8b5..fe314f70f8 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
+++ b/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);

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
index b82bdf8f36..35ddd441b1 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
+++ b/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, 

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
index 19633a4b71..46ba8fdd8f 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
+++ b/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>

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
index 940f72d89a..4e1ac0da82 100644
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
+++ b/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,23 +78,10 @@ DumpLoadedImageProtocolInfo (
   if (EFI_ERROR(Status)) {

     return (EFI_INVALID_PARAMETER);

   }

-

-  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);

+  DevicePathText = ConvertDevicePathToText(Image->FilePath, TRUE, TRUE);

+  CodeTypeText   = ConvertMemoryType(Image->ImageCodeType);

+  DataTypeText   = ConvertMemoryType(Image->ImageDataType);

+  PdbPointer     = (CHAR8*)PeCoffLoaderGetPdbPointer(Image->ImageBase);

   ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_UNLOAD_VERBOSE), gShellDriver1HiiHandle,

     ConvertHandleToHandleIndex(TheHandle),

     TheHandle,