X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FDevicePathDxe%2FDevicePath.c;h=cba21498761145af013a59b9cb6f562a8683d617;hp=660b595de5e4207ac5781a2605964161e87d953a;hb=9d510e61fceee7b92955ef9a3c20343752d8ce3f;hpb=572f5d8a7b704eed9f54381b6bb3a6e3a3e79816

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
index 660b595de5..cba2149876 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
@@ -2,30 +2,29 @@
   Device Path Driver to produce DevPathUtilities Protocol, DevPathFromText Protocol
   and DevPathToText Protocol.
 
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>
-All rights reserved. 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
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-#include "DevicePath.h"
-
-EFI_HANDLE  mDevicePathHandle = NULL;
+#include <Uefi.h>
+#include <Protocol/DevicePathUtilities.h>
+#include <Protocol/DevicePathToText.h>
+#include <Protocol/DevicePathFromText.h>
+#include <Library/UefiDriverEntryPoint.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/PcdLib.h>
 
 GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_UTILITIES_PROTOCOL mDevicePathUtilities = {
-  GetDevicePathSizeProtocolInterface,
-  DuplicateDevicePathProtocolInterface,
-  AppendDevicePathProtocolInterface,
-  AppendDeviceNodeProtocolInterface,
-  AppendDevicePathInstanceProtocolInterface,
-  GetNextDevicePathInstanceProtocolInterface,
-  IsDevicePathMultiInstanceProtocolInterface,
-  CreateDeviceNodeProtocolInterface
+  GetDevicePathSize,
+  DuplicateDevicePath,
+  AppendDevicePath,
+  AppendDevicePathNode,
+  AppendDevicePathInstance,
+  GetNextDevicePathInstance,
+  IsDevicePathMultiInstance,
+  CreateDeviceNode
 };
 
 GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_TO_TEXT_PROTOCOL   mDevicePathToText = {
@@ -38,16 +37,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL mDevicePa
   ConvertTextToDevicePath
 };
 
-GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
-GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_GUID mEfiDevicePathMessagingSASGuid             = DEVICE_PATH_MESSAGING_SAS;
-
-
-
 /**
   The user Entry Point for DevicePath module.
 
-  This is the entrhy point for DevicePath module. It installs the UEFI Device Path Utility Protocol and
-  optionall the Device Path to Text and Device Path from Text protocols based on feature flags.
+  This is the entry point for DevicePath module. It installs the UEFI Device Path Utility Protocol and
+  optionally the Device Path to Text and Device Path from Text protocols based on feature flags.
 
   @param[in] ImageHandle    The firmware allocated handle for the EFI image.
   @param[in] SystemTable    A pointer to the EFI System Table.
@@ -64,12 +58,14 @@ DevicePathEntryPoint (
   )
 {
   EFI_STATUS  Status;
+  EFI_HANDLE  Handle;
 
+  Handle = NULL;
   Status = EFI_UNSUPPORTED;
   if (FeaturePcdGet (PcdDevicePathSupportDevicePathToText)) {
     if (FeaturePcdGet (PcdDevicePathSupportDevicePathFromText)) {
       Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
+                      &Handle,
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
                       &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,
                       &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,
@@ -77,7 +73,7 @@ DevicePathEntryPoint (
                       );
     } else {
       Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
+                      &Handle,
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
                       &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,
                       NULL
@@ -86,14 +82,14 @@ DevicePathEntryPoint (
   } else {
     if (FeaturePcdGet (PcdDevicePathSupportDevicePathFromText)) {
       Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
+                      &Handle,
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
                       &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,
                       NULL
                       );
     } else {
       Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
+                      &Handle,
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
                       NULL
                       );