UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / MdeModulePkg / Universal / DevicePathDxe / DevicePath.c

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
index 716aa605c8564f5c754e1593175e4e5973864782..1fcfef600acf202b6868f867eff05da66c6018fa 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
@@ -2,47 +2,41 @@
   Device Path Driver to produce DevPathUtilities Protocol, DevPathFromText Protocol\r
   and DevPathToText Protocol.\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
-#include "DevicePath.h"\r
-\r
-EFI_HANDLE  mDevicePathHandle = NULL;\r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_UTILITIES_PROTOCOL mDevicePathUtilities = {\r
-  GetDevicePathSizeProtocolInterface,\r
-  DuplicateDevicePathProtocolInterface,\r
-  AppendDevicePathProtocolInterface,\r
-  AppendDeviceNodeProtocolInterface,\r
-  AppendDevicePathInstanceProtocolInterface,\r
-  GetNextDevicePathInstanceProtocolInterface,\r
-  IsDevicePathMultiInstanceProtocolInterface,\r
-  CreateDeviceNodeProtocolInterface\r
+#include <Uefi.h>\r
+#include <Protocol/DevicePathUtilities.h>\r
+#include <Protocol/DevicePathToText.h>\r
+#include <Protocol/DevicePathFromText.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/DevicePathLib.h>\r
+#include <Library/PcdLib.h>\r
+\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_UTILITIES_PROTOCOL  mDevicePathUtilities = {\r
+  GetDevicePathSize,\r
+  DuplicateDevicePath,\r
+  AppendDevicePath,\r
+  AppendDevicePathNode,\r
+  AppendDevicePathInstance,\r
+  GetNextDevicePathInstance,\r
+  IsDevicePathMultiInstance,\r
+  CreateDeviceNode\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_TO_TEXT_PROTOCOL   mDevicePathToText = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  mDevicePathToText = {\r
   ConvertDeviceNodeToText,\r
   ConvertDevicePathToText\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL mDevicePathFromText = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL  mDevicePathFromText = {\r
   ConvertTextToDeviceNode,\r
   ConvertTextToDevicePath\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;\r
-GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_GUID mEfiDevicePathMessagingSASGuid             = DEVICE_PATH_MESSAGING_SAS;\r
-\r
-\r
-\r
 /**\r
   The user Entry Point for DevicePath module.\r
 \r
@@ -59,45 +53,56 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_GUID mEfiDevicePathMessagingSASGuid
 EFI_STATUS\r
 EFIAPI\r
 DevicePathEntryPoint (\r
-  IN EFI_HANDLE           ImageHandle,\r
-  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_STATUS  Status;\r
+  EFI_HANDLE  Handle;\r
 \r
+  Handle = NULL;\r
   Status = EFI_UNSUPPORTED;\r
   if (FeaturePcdGet (PcdDevicePathSupportDevicePathToText)) {\r
     if (FeaturePcdGet (PcdDevicePathSupportDevicePathFromText)) {\r
       Status = gBS->InstallMultipleProtocolInterfaces (\r
-                      &mDevicePathHandle,\r
-                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,\r
-                      &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,\r
-                      &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,\r
+                      &Handle,\r
+                      &gEfiDevicePathUtilitiesProtocolGuid,\r
+                      &mDevicePathUtilities,\r
+                      &gEfiDevicePathToTextProtocolGuid,\r
+                      &mDevicePathToText,\r
+                      &gEfiDevicePathFromTextProtocolGuid,\r
+                      &mDevicePathFromText,\r
                       NULL\r
                       );\r
     } else {\r
       Status = gBS->InstallMultipleProtocolInterfaces (\r
-                      &mDevicePathHandle,\r
-                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,\r
-                      &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,\r
+                      &Handle,\r
+                      &gEfiDevicePathUtilitiesProtocolGuid,\r
+                      &mDevicePathUtilities,\r
+                      &gEfiDevicePathToTextProtocolGuid,\r
+                      &mDevicePathToText,\r
                       NULL\r
                       );\r
     }\r
   } else {\r
     if (FeaturePcdGet (PcdDevicePathSupportDevicePathFromText)) {\r
       Status = gBS->InstallMultipleProtocolInterfaces (\r
-                      &mDevicePathHandle,\r
-                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,\r
-                      &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,\r
+                      &Handle,\r
+                      &gEfiDevicePathUtilitiesProtocolGuid,\r
+                      &mDevicePathUtilities,\r
+                      &gEfiDevicePathFromTextProtocolGuid,\r
+                      &mDevicePathFromText,\r
                       NULL\r
                       );\r
     } else {\r
       Status = gBS->InstallMultipleProtocolInterfaces (\r
-                      &mDevicePathHandle,\r
-                      &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,\r
+                      &Handle,\r
+                      &gEfiDevicePathUtilitiesProtocolGuid,\r
+                      &mDevicePathUtilities,\r
                       NULL\r
                       );\r
     }\r
   }\r
+\r
   return Status;\r
 }\r