From 863986b3c8e67736d361b68e293d01e6f92f825c Mon Sep 17 00:00:00 2001
From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Fri, 26 Jul 2013 03:14:08 +0000
Subject: 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
---
 .../UserProfileManagerDxe/ModifyAccessPolicy.c         | 18 ++----------------
 .../UserProfileManagerDxe/UserProfileManager.h         |  3 +--
 .../UserProfileManagerDxe/UserProfileManagerDxe.inf    |  4 ++--
 3 files changed, 5 insertions(+), 20 deletions(-)

(limited to 'SecurityPkg/UserIdentification')

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c b/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c
index 97bb077e2e..5b4171ddec 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/ModifyAccessPolicy.c
+++ b/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,24 +229,10 @@ 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) {
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h
index fc0efaa4f5..afa420ea7b 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManager.h
+++ b/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>
 
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
index bd19323296..847aaa2156 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerDxe.inf
+++ b/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
\ No newline at end of file
-- 
cgit v1.2.3