X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=DuetPkg%2FFSVariable%2FFSVariable.c;h=653860f1b2d4b8e1d9f16c8622f49d06eb235bb6;hp=0977887818e51756459a5f9071729db48dd509e4;hb=e56dd2ce1342c358962eeab09d54cb1a95c064bf;hpb=e5653d946d3e9ade00365950826268a9d4afdf91

diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index 0977887818..653860f1b2 100644
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -35,15 +35,13 @@ VARIABLE_STORE_HEADER mStoreHeaderTemplate = {
 //
 VARIABLE_GLOBAL  *mGlobal;
 
-STATIC
 VOID
 EFIAPI
-OnVirtualAddressChange (
+OnVirtualAddressChangeFsv (
   IN EFI_EVENT        Event,
   IN VOID             *Context
   );
 
-STATIC
 VOID
 EFIAPI
 OnSimpleFileSystemInstall (
@@ -51,7 +49,6 @@ OnSimpleFileSystemInstall (
   IN VOID             *Context
   );
 
-STATIC
 BOOLEAN
 IsValidVariableHeader (
   IN  VARIABLE_HEADER   *Variable
@@ -81,7 +78,6 @@ Returns:
   return TRUE;
 }
 
-STATIC
 VARIABLE_STORE_STATUS
 GetVariableStoreStatus (
   IN VARIABLE_STORE_HEADER *VarStoreHeader
@@ -121,7 +117,6 @@ Returns:
   }
 }
 
-STATIC
 UINT8 *
 GetVariableDataPtr (
   IN  VARIABLE_HEADER   *Variable
@@ -148,7 +143,6 @@ Returns:
   return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + Variable->NameSize + GET_PAD_SIZE (Variable->NameSize));
 }
 
-STATIC
 VARIABLE_HEADER *
 GetNextVariablePtr (
   IN  VARIABLE_HEADER   *Variable
@@ -178,7 +172,6 @@ Returns:
   return (VARIABLE_HEADER *) ((UINTN) GetVariableDataPtr (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));
 }
 
-STATIC
 VARIABLE_HEADER *
 GetEndPointer (
   IN VARIABLE_STORE_HEADER       *VarStoreHeader
@@ -250,7 +243,6 @@ Returns:
   return FALSE;
 }
 
-STATIC
 EFI_STATUS
 Reclaim (
   IN  VARIABLE_STORAGE_TYPE StorageType,
@@ -374,7 +366,6 @@ Returns:
   return Status;
 }
 
-STATIC
 EFI_STATUS
 FindVariable (
   IN  CHAR16                  *VariableName,
@@ -1164,8 +1155,12 @@ Returns:
     Status = EFI_NOT_FOUND;
     return Status;
   }
-
-  VariableStoreEntry = FlashMapEntryData->Entries[0];
+  
+  CopyMem(
+    (VOID*)&VariableStoreEntry,
+    (VOID*)&FlashMapEntryData->Entries[0],
+    sizeof(EFI_FLASH_SUBAREA_ENTRY)
+    );
 
   //
   // Mark the variable storage region of the FLASH as RUNTIME
@@ -1301,10 +1296,9 @@ Returns:
 
 
 
-STATIC
 VOID
 EFIAPI
-OnVirtualAddressChange (
+OnVirtualAddressChangeFsv (
   IN EFI_EVENT        Event,
   IN VOID             *Context
   )