1. delete Include/Guid/VariableInfo.h

[mirror_edk2.git] / DuetPkg / FSVariable / MemStorage.c

diff --git a/DuetPkg/FSVariable/MemStorage.c b/DuetPkg/FSVariable/MemStorage.c
index ed72b898f0e658b60d815fd0f16e2375d73a4366..02582d953ad908def33a4f307e8d3d03790873e2 100644 (file)
--- a/DuetPkg/FSVariable/MemStorage.c
+++ b/DuetPkg/FSVariable/MemStorage.c
@@ -22,22 +22,19 @@ Revision History
 --*/\r
 #include "FSVariable.h"\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeMs (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemEraseStore(\r
   IN VARIABLE_STORAGE   *This\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemWriteStore (\r
@@ -57,32 +54,31 @@ MemStorageConstructor (
   EFI_STATUS                  Status;\r
   VS_DEV                      *Dev;\r
 \r
-  Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), &Dev);\r
+  Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), (VOID **) &Dev);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   ZeroMem (Dev, sizeof(VS_DEV));\r
 \r
-  Dev->Signature   = VARIABLE_STORE_SIGNATURE;\r
+  CopyGuid (&Dev->Signature, &gEfiVariableGuid);\r
   Dev->Size        = Size;\r
 \r
   Dev->VarStore.Erase    = MemEraseStore;\r
   Dev->VarStore.Write    = MemWriteStore;\r
 \r
-  Status = gBS->AllocatePool (EfiRuntimeServicesData, Size, &VAR_DATA_PTR (Dev));\r
+  Status = gBS->AllocatePool (EfiRuntimeServicesData, Size, (VOID **) &VAR_DATA_PTR (Dev));\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   DEBUG ((EFI_D_ERROR, "VStorage: Size = 0x%x\n", Size));\r
   \r
   *VarStore       = &Dev->VarStore;\r
-  *GoVirtualEvent = OnVirtualAddressChange;\r
+  *GoVirtualEvent = OnVirtualAddressChangeMs;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeMs (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
   )\r
@@ -91,12 +87,11 @@ OnVirtualAddressChange (
 \r
   Dev = DEV_FROM_THIS (Context);\r
 \r
-  EfiConvertPointer (0, &VAR_DATA_PTR (Dev));\r
-  EfiConvertPointer (0, (VOID**)&Dev->VarStore.Erase);\r
-  EfiConvertPointer (0, (VOID**)&Dev->VarStore.Write);\r
+  EfiConvertPointer (0, (VOID **)&VAR_DATA_PTR (Dev));\r
+  EfiConvertPointer (0, (VOID **)&Dev->VarStore.Erase);\r
+  EfiConvertPointer (0, (VOID **)&Dev->VarStore.Write);\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemEraseStore(\r
@@ -111,7 +106,6 @@ MemEraseStore(
 }\r
 \r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemWriteStore (\r