Check in patch to refine DevicePath Module and USB2HostController Module.

[mirror_edk2.git] / EdkModulePkg / Universal / DevicePath / Dxe / DevicePath.c

diff --git a/EdkModulePkg/Universal/DevicePath/Dxe/DevicePath.c b/EdkModulePkg/Universal/DevicePath/Dxe/DevicePath.c
index 79741a4615157a1a1093a1e626987e7537fb94c6..78c5defe3a98f239fd1677dfb868233ff4f2e58b 100644 (file)
--- a/EdkModulePkg/Universal/DevicePath/Dxe/DevicePath.c
+++ b/EdkModulePkg/Universal/DevicePath/Dxe/DevicePath.c
@@ -20,8 +20,6 @@ Abstract:
 
 --*/
 
-#include <Uefi/UefiSpec.h>
-#include <Protocol/DevicePath.h>
 #include "DevicePath.h"
 
 DEVICE_PATH_DRIVER_PRIVATE_DATA mPrivateData;
@@ -29,27 +27,6 @@ DEVICE_PATH_DRIVER_PRIVATE_DATA mPrivateData;
 EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid = DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL;
 EFI_GUID mEfiDevicePathMessagingSASGuid             = DEVICE_PATH_MESSAGING_SAS;
 
-STATIC EFI_DEVICE_PATH_UTILITIES_PROTOCOL mDevicePathUtilitiesProtocol = {
-  GetDevicePathSize,
-  DuplicateDevicePath,
-  AppendDevicePath,
-  AppendDeviceNode,
-  AppendDevicePathInstance,
-  GetNextDevicePathInstance,
-  IsDevicePathMultiInstance,
-  CreateDeviceNode
-};
-
-STATIC EFI_DEVICE_PATH_TO_TEXT_PROTOCOL   mDevicePathToTextProtocol = {
-  ConvertDeviceNodeToText,
-  ConvertDevicePathToText
-};
-
-STATIC EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL mDevicePathFromTextProtocol = {
-  ConvertTextToDeviceNode,
-  ConvertTextToDevicePath
-};
-
 EFI_STATUS
 EFIAPI
 DevicePathEntryPoint (
@@ -75,14 +52,14 @@ DevicePathEntryPoint (
 
   mPrivateData.Signature = DEVICE_PATH_DRIVER_SIGNATURE;
 
-  mPrivateData.DevicePathUtilities.GetDevicePathSize         = GetDevicePathSize;
-  mPrivateData.DevicePathUtilities.DuplicateDevicePath       = DuplicateDevicePath;
-  mPrivateData.DevicePathUtilities.AppendDevicePath          = AppendDevicePath;
-  mPrivateData.DevicePathUtilities.AppendDeviceNode          = AppendDeviceNode;
-  mPrivateData.DevicePathUtilities.AppendDevicePathInstance  = AppendDevicePathInstance;
-  mPrivateData.DevicePathUtilities.GetNextDevicePathInstance = GetNextDevicePathInstance;
-  mPrivateData.DevicePathUtilities.IsDevicePathMultiInstance = IsDevicePathMultiInstance;
-  mPrivateData.DevicePathUtilities.CreateDeviceNode          = CreateDeviceNode;
+  mPrivateData.DevicePathUtilities.GetDevicePathSize         = GetDevicePathSizeProtocolInterface;
+  mPrivateData.DevicePathUtilities.DuplicateDevicePath       = DuplicateDevicePathProtocolInterface;
+  mPrivateData.DevicePathUtilities.AppendDevicePath          = AppendDevicePathProtocolInterface;
+  mPrivateData.DevicePathUtilities.AppendDeviceNode          = AppendDeviceNodeProtocolInterface;
+  mPrivateData.DevicePathUtilities.AppendDevicePathInstance  = AppendDevicePathInstanceProtocolInterface;
+  mPrivateData.DevicePathUtilities.GetNextDevicePathInstance = GetNextDevicePathInstanceProtocolInterface;
+  mPrivateData.DevicePathUtilities.IsDevicePathMultiInstance = IsDevicePathMultiInstanceProtocolInterface;
+  mPrivateData.DevicePathUtilities.CreateDeviceNode          = CreateDeviceNodeProtocolInterface;
 
   mPrivateData.DevicePathToText.ConvertDeviceNodeToText      = ConvertDeviceNodeToText;
   mPrivateData.DevicePathToText.ConvertDevicePathToText      = ConvertDevicePathToText;