1. delete Include/Guid/VariableInfo.h

[mirror_edk2.git] / DuetPkg / FSVariable / FSVariable.h

diff --git a/DuetPkg/FSVariable/FSVariable.h b/DuetPkg/FSVariable/FSVariable.h
index 434c302783a204b76ce14ad72f1089c847c81c5c..6da525cbf6c2f48925a0f4ac09374b6ca6afb629 100644 (file)
--- a/DuetPkg/FSVariable/FSVariable.h
+++ b/DuetPkg/FSVariable/FSVariable.h
@@ -38,6 +38,7 @@ Abstract:
 \r
 #include <Guid/HobList.h>\r
 #include <Guid/FlashMapHob.h>\r
+#include <Guid/VariableFormat.h>\r
 \r
 #include <Protocol/Variable.h>\r
 #include <Protocol/VariableWrite.h>\r
@@ -46,22 +47,12 @@ Abstract:
 \r
 \r
 #include "EfiFlashMap.h"\r
-#include "VariableFormat.h"\r
 #include "VariableStorage.h"\r
 \r
 #define VOLATILE_VARIABLE_STORE_SIZE  (64 * 1024)\r
 #define VARIABLE_SCRATCH_SIZE         (4 * 1024)\r
 #define VARIABLE_RECLAIM_THRESHOLD    (1024)\r
 \r
-//\r
-// Define GET_PAD_SIZE to optimize compiler\r
-//\r
-#if ((ALIGNMENT == 0) || (ALIGNMENT == 1))\r
-#define GET_PAD_SIZE(a) (0)\r
-#else\r
-#define GET_PAD_SIZE(a) (((~a) + 1) & (ALIGNMENT - 1))\r
-#endif\r
-\r
 #define GET_VARIABLE_NAME_PTR(a)  (CHAR16 *) ((UINTN) (a) + sizeof (VARIABLE_HEADER))\r
 \r
 typedef enum {\r
@@ -105,16 +96,14 @@ EFIAPI
 VariableServiceInitialize (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 EFIAPI\r
 VariableClassAddressChangeEvent (\r
   IN EFI_EVENT        Event,\r
   IN VOID             *Context\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -124,8 +113,7 @@ GetVariable (
   OUT     UINT32            *Attributes OPTIONAL,\r
   IN OUT  UINTN             *DataSize,\r
   OUT     VOID              *Data\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -133,8 +121,7 @@ GetNextVariableName (
   IN OUT  UINTN             *VariableNameSize,\r
   IN OUT  CHAR16            *VariableName,\r
   IN OUT  EFI_GUID          *VendorGuid\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -144,8 +131,7 @@ SetVariable (
   IN UINT32                  Attributes,\r
   IN UINTN                   DataSize,\r
   IN VOID                    *Data\r
-  )\r
-;\r
+  );\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 EFI_STATUS\r
@@ -155,8 +141,7 @@ QueryVariableInfo (
   OUT UINT64                 *MaximumVariableStorageSize,\r
   OUT UINT64                 *RemainingVariableStorageSize,\r
   OUT UINT64                 *MaximumVariableSize\r
-  )\r
-;\r
+  );\r
 #endif // EFI_SPECIFICATION_VERSION >= 0x00020000\r
 \r
 #endif\r