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

3 files changed, 16 insertions, 34 deletions

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h b/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h
index 60113fee12..75af763522 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/InternalPlatDriOverrideDxe.h
+++ b/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>

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
index 9c0064df29..ab254a0b45 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatDriOverrideDxe.c
+++ b/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

@@ -104,45 +104,29 @@ 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.

-  

+  Converting a given device to an unicode string.

+

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

-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText;

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

-    return ToText;

+  CHAR16                          *Text;

+  Text = ConvertDevicePathToText (

+           DevPath,

+           FALSE,

+           TRUE

+           );

+  if (Text == NULL) {

+    return AllocateCopyPool (sizeof (L"?"), L"?");

+  } else {

+    return Text;

   }

-

-  return L"?";

 }

 

 /**

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
index bf333d29df..9702f249b5 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
+++ b/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]