Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Universal/DevicePathDxe/DevicePath.c (modified) (7 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/DevicePathDxe/DevicePath.c

@@ -3 +3 @@
   and DevPathToText Protocol.
 
-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 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
@@ -14 +14 @@
 **/
 
-#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
 };
 
@@ -38 +43 @@
   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;
-
-
 
 /**
@@ -65 +65 @@
 {
   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,
@@ -78 +80 @@
     } else {
       Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
+                      &Handle,
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
                       &gEfiDevicePathToTextProtocolGuid,    &mDevicePathToText,
@@ -87 +89 @@
     if (FeaturePcdGet (PcdDevicePathSupportDevicePathFromText)) {
       Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
+                      &Handle,
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
                       &gEfiDevicePathFromTextProtocolGuid,  &mDevicePathFromText,
@@ -94 +96 @@
     } else {
       Status = gBS->InstallMultipleProtocolInterfaces (
-                      &mDevicePathHandle,
+                      &Handle,
                       &gEfiDevicePathUtilitiesProtocolGuid, &mDevicePathUtilities,
                       NULL