X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FLibrary%2FEdkFvbServiceLib%2Fx64%2FFvb.c;h=4dcb81d2161c4b8b3a9776604db2d4c21abafcb4;hp=76ddfa80d42834cbffefecd9943f171ba353cc93;hb=a72074803468da9503582876668d9a3abef42878;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4

diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c
index 76ddfa80d4..4dcb81d216 100644
--- a/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c
@@ -35,9 +35,9 @@ Key:
 // Lib will ASSERT if more FVB devices than this are added to the system.
 //
 STATIC FVB_ENTRY          *mFvbEntry;
-STATIC EFI_EVENT          mFvbVirtualNotifyEvent;
+// STATIC EFI_EVENT          mFvbVirtualNotifyEvent;
 STATIC EFI_EVENT          mFvbRegistration;
-STATIC EFI_EVENT          mEfiFvbVirtualNotifyEvent;
+// STATIC EFI_EVENT          mEfiFvbVirtualNotifyEvent;
 STATIC BOOLEAN            mEfiFvbInitialized        = FALSE;
 STATIC UINTN              mFvbCount;
 
@@ -102,7 +102,8 @@ Returns:
       //
       // Use the next free slot for a new entry
       //
-      UpdateIndex                   = mFvbCount++;;
+      UpdateIndex                   = mFvbCount++;
+			ASSERT (UpdateIndex < MAX_FVB_COUNT);      
       mFvbEntry[UpdateIndex].Handle = Handle;
     }
     //
@@ -113,10 +114,10 @@ Returns:
     //
     //  Get the interface pointer and if it's ours, skip it
     //
-    Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolumeBlockProtocolGuid, &mFvbEntry[UpdateIndex].Fvb);
+    Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolumeBlockProtocolGuid, (VOID **)&mFvbEntry[UpdateIndex].Fvb);
     ASSERT_EFI_ERROR (Status);
 
-    Status = gBS->HandleProtocol (Handle, &gEfiFvbExtensionProtocolGuid, &mFvbEntry[UpdateIndex].FvbExtension);
+    Status = gBS->HandleProtocol (Handle, &gEfiFvbExtensionProtocolGuid, (VOID **)&mFvbEntry[UpdateIndex].FvbExtension);
     if (Status != EFI_SUCCESS) {
       mFvbEntry[UpdateIndex].FvbExtension = NULL;
     }