MdeModulePkg/AtaAtapiPassThru: Revert patch to disable Bus Master

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

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
index 660b595de5e4207ac5781a2605964161e87d953a..70f03bd27aa0e2cabd1df9b0ae9a743c214d98c6 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c
@@ -2,8 +2,8 @@
   Device Path Driver to produce DevPathUtilities Protocol, DevPathFromText Protocol\r
   and DevPathToText Protocol.\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2013, 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
@@ -13,19 +13,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include "DevicePath.h"\r
-\r
-EFI_HANDLE  mDevicePathHandle = NULL;\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
-  GetDevicePathSizeProtocolInterface,\r
-  DuplicateDevicePathProtocolInterface,\r
-  AppendDevicePathProtocolInterface,\r
-  AppendDeviceNodeProtocolInterface,\r
-  AppendDevicePathInstanceProtocolInterface,\r
-  GetNextDevicePathInstanceProtocolInterface,\r
-  IsDevicePathMultiInstanceProtocolInterface,\r
-  CreateDeviceNodeProtocolInterface\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
@@ -38,16 +43,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL mDevicePa
   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
-  This is the entrhy point for DevicePath module. It installs the UEFI Device Path Utility Protocol and\r
-  optionall the Device Path to Text and Device Path from Text protocols based on feature flags.\r
+  This is the entry point for DevicePath module. It installs the UEFI Device Path Utility Protocol and\r
+  optionally the Device Path to Text and Device Path from Text protocols based on feature flags.\r
 \r
   @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r
@@ -64,12 +64,14 @@ DevicePathEntryPoint (
   )\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
+                      &Handle,\r
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,\r
                       &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,\r
                       &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,\r
@@ -77,7 +79,7 @@ DevicePathEntryPoint (
                       );\r
     } else {\r
       Status = gBS->InstallMultipleProtocolInterfaces (\r
-                      &mDevicePathHandle,\r
+                      &Handle,\r
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,\r
                       &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,\r
                       NULL\r
@@ -86,14 +88,14 @@ DevicePathEntryPoint (
   } else {\r
     if (FeaturePcdGet (PcdDevicePathSupportDevicePathFromText)) {\r
       Status = gBS->InstallMultipleProtocolInterfaces (\r
-                      &mDevicePathHandle,\r
+                      &Handle,\r
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,\r
                       &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,\r
                       NULL\r
                       );\r
     } else {\r
       Status = gBS->InstallMultipleProtocolInterfaces (\r
-                      &mDevicePathHandle,\r
+                      &Handle,\r
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,\r
                       NULL\r
                       );\r