1. delete Include/Guid/VariableInfo.h

[mirror_edk2.git] / MdeModulePkg / Library / DxePlatDriOverLib / PlatDriOver.h

diff --git a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h
index 50622b8bd361923bb8c7f65cbff838b873848efd..7cede71388388a4b12989fa23156ce037fb6bcde 100644 (file)
--- a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h
+++ b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h
@@ -19,10 +19,9 @@
 \r
 #include <Protocol/FirmwareVolume2.h>\r
 #include <Protocol/LoadedImage.h>\r
-#include <Protocol/PlatformDriverOverride.h>\r
 #include <Protocol/DevicePath.h>\r
-#include <Protocol/DriverBinding.h>\r
 #include <Protocol/BusSpecificDriverOverride.h>\r
+#include <Protocol/DriverBinding.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
@@ -34,12 +33,13 @@
 #include <Library/DevicePathLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/DxeServicesTableLib.h>\r
-#include <Library/PlatDriOverLib.h>\r
+#include <Library/PlatformDriverOverrideLib.h>\r
 \r
 #include <Guid/OverrideVariable.h>\r
+#include <Guid/VariableFormat.h>\r
 \r
 \r
-#define PLATFORM_OVERRIDE_ITEM_SIGNATURE      EFI_SIGNATURE_32('p','d','o','i')\r
+#define PLATFORM_OVERRIDE_ITEM_SIGNATURE      SIGNATURE_32('p','d','o','i')\r
  typedef struct _PLATFORM_OVERRIDE_ITEM {\r
   UINTN                                 Signature;\r
   LIST_ENTRY                            Link;\r
@@ -52,7 +52,7 @@
   EFI_HANDLE                            LastReturnedImageHandle;\r
 } PLATFORM_OVERRIDE_ITEM;\r
 \r
-#define DRIVER_IMAGE_INFO_SIGNATURE           EFI_SIGNATURE_32('p','d','i','i')\r
+#define DRIVER_IMAGE_INFO_SIGNATURE           SIGNATURE_32('p','d','i','i')\r
 typedef struct _DRIVER_IMAGE_INFO {\r
   UINTN                                 Signature;\r
   LIST_ENTRY                            Link;\r
@@ -62,7 +62,7 @@ typedef struct _DRIVER_IMAGE_INFO {
   BOOLEAN                               UnStartable;\r
 } DRIVER_IMAGE_INFO;\r
 \r
-#define DEVICE_PATH_STACK_ITEM_SIGNATURE      EFI_SIGNATURE_32('d','p','s','i')\r
+#define DEVICE_PATH_STACK_ITEM_SIGNATURE      SIGNATURE_32('d','p','s','i')\r
 typedef struct _DEVICE_PATH_STACK_ITEM{\r
   UINTN                                 Signature;\r
   LIST_ENTRY                            Link;\r