Update Mde/MdeModulePkg to support ICC build for IA32/X64.

[mirror_edk2.git] / MdeModulePkg / Library / EdkFvbServiceLib / X64 / Fvb.c

diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c b/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c
index 7bc89a0c8732ed24b9372854a4ea75abdb5da2c4..c3459656b59ff00a6746289c93f0562f2a117571 100644 (file)
--- a/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c
+++ b/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c
@@ -23,16 +23,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Fvb.h"\r
 \r
 //\r
-// Event for Exit Boot Services Callback\r
+// Event for Set Virtual Map Changed Event\r
 //\r
-STATIC EFI_EVENT mExitBootServicesEvent = NULL;\r
+STATIC EFI_EVENT mSetVirtualMapChangedEvent = NULL;\r
 \r
 //\r
 // Lib will ASSERT if more FVB devices than this are added to the system.\r
 //\r
 STATIC FVB_ENTRY          *mFvbEntry;\r
 STATIC EFI_EVENT          mFvbRegistration;\r
-STATIC BOOLEAN            mEfiFvbInitialized        = FALSE;\r
 STATIC UINTN              mFvbCount;\r
 \r
 /**\r
@@ -250,8 +249,8 @@ FvbVirtualAddressChangeNotifyEvent (
       if (NULL != mFvbEntry[Index].Fvb) {\r
         EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->GetBlockSize);\r
         EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->GetPhysicalAddress);\r
-        EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->GetVolumeAttributes);\r
-        EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->SetVolumeAttributes);\r
+        EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->GetAttributes);\r
+        EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->SetAttributes);\r
         EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->Read);\r
         EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->Write);\r
         EfiConvertPointer (0x0, (VOID **) &mFvbEntry[Index].Fvb->EraseBlocks);\r
@@ -311,16 +310,14 @@ FvbLibInitialize (
   // Register SetVirtualAddressMap () notify function\r
   //\r
   Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+                  EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
                   TPL_NOTIFY,\r
                   FvbVirtualAddressChangeNotifyEvent,\r
                   NULL,\r
-                  &mExitBootServicesEvent\r
+                  &mSetVirtualMapChangedEvent\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  mEfiFvbInitialized = TRUE;\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -459,7 +456,7 @@ EfiFvbGetVolumeAttributes (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  return mFvbEntry[Instance].Fvb->GetVolumeAttributes (mFvbEntry[Instance].Fvb, Attributes);\r
+  return mFvbEntry[Instance].Fvb->GetAttributes (mFvbEntry[Instance].Fvb, Attributes);\r
 }\r
 \r
 /**\r
@@ -479,8 +476,8 @@ EfiFvbGetVolumeAttributes (
 **/\r
 EFI_STATUS\r
 EfiFvbSetVolumeAttributes (\r
-  IN UINTN                                Instance,\r
-  IN EFI_FVB_ATTRIBUTES                   Attributes\r
+  IN     UINTN                                Instance,\r
+  IN OUT EFI_FVB_ATTRIBUTES                   *Attributes\r
   )\r
 {\r
   if (Instance >= mFvbCount) {\r
@@ -491,7 +488,7 @@ EfiFvbSetVolumeAttributes (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  return mFvbEntry[Instance].Fvb->SetVolumeAttributes (mFvbEntry[Instance].Fvb, &Attributes);\r
+  return mFvbEntry[Instance].Fvb->SetAttributes (mFvbEntry[Instance].Fvb, Attributes);\r
 }\r
 \r
 /**\r