Patch to remove STATIC modifier. This is on longer recommended by EFI Framework codin...

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

diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c
index 4e366de0a43a7ea4aa746efbb64af44530a5a09f..2334a16fd2102c3f2b4a90fc703dba55898d90e1 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
@@ -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
@@ -229,7 +223,9 @@ OnSimpleFileSystemInstall (
   NumBytes = Dev->Size;\r
   Status = File->Write (File, &NumBytes, VAR_DATA_PTR (Dev));\r
   ASSERT_EFI_ERROR (Status);\r
-  FileClose (File);\r
+  // KEN: bugbug here if closing file, volume handle will be free,\r
+  // and system will be hang when accessing volume handle in future.\r
+  //FileClose (File);\r
   DEBUG ((EFI_D_ERROR, "FileStorage: Mapped to file!\n"));\r
 }\r
 \r
@@ -264,7 +260,7 @@ FileStorageConstructor (
   // add notify on SFS's installation.\r
 \r
   Status = gBS->CreateEvent (\r
-                  EFI_EVENT_NOTIFY_SIGNAL,\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_CALLBACK,\r
                   OnSimpleFileSystemInstall,\r
                   Dev,\r
@@ -280,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
@@ -318,7 +313,6 @@ FileEraseStore(
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 FileWriteStore (\r
@@ -356,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
@@ -373,7 +366,6 @@ OnVirtualAddressChange (
   EfiConvertPointer (0, (VOID **) &Dev->VarStore.Write);\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 OpenStore (\r
   IN  EFI_DEVICE_PATH_PROTOCOL  *Device,\r
@@ -407,7 +399,7 @@ OpenStore (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
-  \r
+\r
   //\r
   // Open the root directory of the volume\r
   //\r