Clean up PERF macro usage. The macros were being used with 0 as the first parameter...

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

diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c
index 3588f3ecbc81a7d71e451edfb169b7a6ba5b4915..400f9ffaab9a0f2c34c89a33746d1d0d5476524d 100644 (file)
--- a/DuetPkg/FSVariable/FileStorage.c
+++ b/DuetPkg/FSVariable/FileStorage.c
@@ -28,22 +28,19 @@ VOID             *mSFSRegistration;
 // Prototypes\r
 //\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeFs (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FileEraseStore(\r
   IN VARIABLE_STORAGE     *This\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FileWriteStore (\r
@@ -53,7 +50,6 @@ FileWriteStore (
   IN VOID                 *Buffer\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 OpenStore (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Device,\r
@@ -65,7 +61,6 @@ OpenStore (
 //\r
 // Implementation below:\r
 //\r
-STATIC\r
 VOID\r
 FileClose (\r
   IN  EFI_FILE                   *File\r
@@ -159,7 +154,7 @@ CheckStoreExists (
   Status = gBS->HandleProtocol (\r
                   Handle,\r
                   &gEfiSimpleFileSystemProtocolGuid,\r
-                  &Volume\r
+                  (VOID **) &Volume\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -173,7 +168,6 @@ CheckStoreExists (
 // read the store_header, init store_header if it has not been inited (read sth. about format/heathy)\r
 // reclaim space using scratch memory\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
 OnSimpleFileSystemInstall (\r
@@ -249,11 +243,11 @@ FileStorageConstructor (
   EFI_STATUS                Status;\r
   EFI_EVENT                 Event;\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
   ZeroMem (Dev, sizeof(VS_DEV));\r
 \r
-  Dev->Signature          = VARIABLE_STORE_SIGNATURE;\r
+  Dev->Signature          = VS_DEV_SIGNATURE;\r
   Dev->Size               = Size;\r
   VAR_DATA_PTR (Dev)      = (UINT8 *) (UINTN) NvStorageBase;\r
   VAR_FILE_VOLUMEID (Dev) = VolumeId;\r
@@ -282,11 +276,10 @@ FileStorageConstructor (
   ASSERT_EFI_ERROR (Status);\r
 \r
   *VarStore       = &Dev->VarStore;\r
-  *GoVirtualEvent = OnVirtualAddressChange;\r
+  *GoVirtualEvent = OnVirtualAddressChangeFs;\r
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FileEraseStore(\r
@@ -320,7 +313,6 @@ FileEraseStore(
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FileWriteStore (\r
@@ -358,10 +350,9 @@ FileWriteStore (
   return Status;\r
 }\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeFs (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
   )\r
@@ -370,12 +361,11 @@ OnVirtualAddressChange (
 \r
   Dev = DEV_FROM_THIS (Context);\r
 \r
-  EfiConvertPointer (0, &VAR_DATA_PTR (Dev));\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
 OpenStore (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Device,\r
@@ -404,7 +394,7 @@ OpenStore (
   Status = gBS->HandleProtocol (\r
                   Handle,\r
                   &gEfiSimpleFileSystemProtocolGuid,\r
-                  &Volume\r
+                  (VOID **) &Volume\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r