Merge the PI enabling works from the branch

[mirror_edk2.git] / Nt32Pkg / Library / EdkGenericBdsLib / BdsBoot.c

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
index 69f41c0484c47c7d1b176049b76e13e9f935eb4e..2e241ed6b94dc1cba11301c2640ea9931b83ba0e 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
@@ -20,7 +20,7 @@ Abstract:
 \r
 --*/\r
 \r
-#include <EdkGenericBdsLibInternal.h>\r
+#include "EdkGenericBdsLibInternal.h"\r
 \r
 BOOLEAN mEnumBootDevice = FALSE;\r
 \r
@@ -771,7 +771,7 @@ Returns:
   UINTN                         NumberLoadFileHandles;\r
   EFI_HANDLE                    *LoadFileHandles;\r
   VOID                          *ProtocolInstance;\r
-  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;\r
   UINTN                         FvHandleCount;\r
   EFI_HANDLE                    *FvHandleBuffer;\r
   EFI_FV_FILETYPE               Type;\r
@@ -902,7 +902,7 @@ Returns:
   //\r
   gBS->LocateHandleBuffer (\r
         ByProtocol,\r
-        &gEfiFirmwareVolumeProtocolGuid,\r
+        &gEfiFirmwareVolume2ProtocolGuid,\r
         NULL,\r
         &FvHandleCount,\r
         &FvHandleBuffer\r
@@ -910,7 +910,7 @@ Returns:
   for (Index = 0; Index < FvHandleCount; Index++) {\r
     gBS->HandleProtocol (\r
           FvHandleBuffer[Index],\r
-          &gEfiFirmwareVolumeProtocolGuid,\r
+          &gEfiFirmwareVolume2ProtocolGuid,\r
           (VOID **) &Fv\r
           );\r
 \r