Merge the PI enabling works from the branch

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / Dispatcher / Dispatcher.c

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index 3de4edf00ce78a6dd913bb3735ad0c0a0099adad..c7b4cc3e12a9a0f1f4e7d225acb18f7b9ed4a4da 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -118,7 +118,7 @@ CoreFwVolEventProtocolNotify (
 STATIC\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 CoreFvToDevicePath (\r
-  IN  EFI_FIRMWARE_VOLUME_PROTOCOL    *Fv,\r
+  IN  EFI_FIRMWARE_VOLUME2_PROTOCOL   *Fv,\r
   IN  EFI_HANDLE                      FvHandle,\r
   IN  EFI_GUID                        *DriverName\r
   );\r
@@ -126,7 +126,7 @@ CoreFvToDevicePath (
 STATIC \r
 EFI_STATUS\r
 CoreAddToDriverList (\r
-  IN  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv,\r
+  IN  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv,\r
   IN  EFI_HANDLE                    FvHandle,\r
   IN  EFI_GUID                      *DriverName\r
   );\r
@@ -134,7 +134,7 @@ CoreAddToDriverList (
 STATIC\r
 EFI_STATUS \r
 CoreProcessFvImageFile (\r
-  IN  EFI_FIRMWARE_VOLUME_PROTOCOL    *Fv,\r
+  IN  EFI_FIRMWARE_VOLUME2_PROTOCOL   *Fv,\r
   IN  EFI_HANDLE                      FvHandle,\r
   IN  EFI_GUID                        *DriverName\r
   );\r
@@ -218,7 +218,7 @@ Returns:
   EFI_STATUS                    Status;\r
   EFI_SECTION_TYPE              SectionType;\r
   UINT32                        AuthenticationStatus;\r
-  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;\r
 \r
   \r
   Fv = DriverEntry->Fv;\r
@@ -670,7 +670,7 @@ Returns:
 STATIC\r
 EFI_DEVICE_PATH_PROTOCOL *\r
 CoreFvToDevicePath (\r
-  IN  EFI_FIRMWARE_VOLUME_PROTOCOL    *Fv,\r
+  IN  EFI_FIRMWARE_VOLUME2_PROTOCOL   *Fv,\r
   IN  EFI_HANDLE                      FvHandle,\r
   IN  EFI_GUID                        *DriverName\r
   )\r
@@ -727,7 +727,7 @@ Returns:
 \r
 EFI_STATUS\r
 CoreAddToDriverList (\r
-  IN  EFI_FIRMWARE_VOLUME_PROTOCOL    *Fv,\r
+  IN  EFI_FIRMWARE_VOLUME2_PROTOCOL   *Fv,\r
   IN  EFI_HANDLE                      FvHandle,\r
   IN  EFI_GUID                        *DriverName\r
   )\r
@@ -843,7 +843,7 @@ Returns:
 \r
 EFI_STATUS \r
 CoreProcessFvImageFile (\r
-  IN  EFI_FIRMWARE_VOLUME_PROTOCOL    *Fv,\r
+  IN  EFI_FIRMWARE_VOLUME2_PROTOCOL   *Fv,\r
   IN  EFI_HANDLE                      FvHandle,\r
   IN  EFI_GUID                        *DriverName\r
   )\r
@@ -955,7 +955,7 @@ Returns:
   EFI_STATUS                    Status;\r
   EFI_STATUS                    GetNextFileStatus;\r
   EFI_STATUS                    SecurityStatus;\r
-  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;\r
   EFI_DEVICE_PATH_PROTOCOL      *FvDevicePath;\r
   EFI_HANDLE                    FvHandle;\r
   UINTN                         BufferSize;\r
@@ -1011,7 +1011,7 @@ Returns:
     FvIsBeingProcesssed (FvHandle);\r
 \r
 \r
-    Status = CoreHandleProtocol (FvHandle, &gEfiFirmwareVolumeProtocolGuid, (VOID **)&Fv);\r
+    Status = CoreHandleProtocol (FvHandle, &gEfiFirmwareVolume2ProtocolGuid, (VOID **)&Fv);\r
     if (EFI_ERROR (Status)) {\r
       //\r
       // The Handle has a FirmwareVolumeDispatch protocol and should also contiain\r
@@ -1186,7 +1186,7 @@ Returns:
 --*/\r
 {\r
   mFwVolEvent = CoreCreateProtocolNotifyEvent (\r
-                  &gEfiFirmwareVolumeProtocolGuid, \r
+                  &gEfiFirmwareVolume2ProtocolGuid, \r
                   TPL_CALLBACK,\r
                   CoreFwVolEventProtocolNotify,\r
                   NULL,\r