Merge R8->R9 tracker 5935 and 7080 to update runtime arch protocol to DxeCis 0.91. Update DxeCore and Runtime driver to follow new definitions.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2101 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 1 insertions, 42 deletions

diff --git a/EdkModulePkg/Core/Dxe/DxeMain.h b/EdkModulePkg/Core/Dxe/DxeMain.h
index 4ff23f3b0b..28c805703a 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain.h
+++ b/EdkModulePkg/Core/Dxe/DxeMain.h
@@ -130,6 +130,7 @@ extern EFI_LOADED_IMAGE_PROTOCOL                *gDxeCoreLoadedImage;
 extern EFI_MEMORY_TYPE_INFORMATION              gMemoryTypeInformation[EfiMaxMemoryType + 1];

 

 extern BOOLEAN                                  gDispatcherRunning;

+extern EFI_RUNTIME_ARCH_PROTOCOL                gRuntimeTemplate;

 

 //

 // Service Initialization Functions

@@ -316,27 +317,6 @@ Returns:
 ;

 

 EFI_STATUS

-CoreShutdownEventServices (

-  VOID

-  )

-/*++

-

-Routine Description:

-

-  Register all runtime events to make sure they are still available after ExitBootService.

-

-Arguments:

-

-  None

-    

-Returns:

-

-  EFI_SUCCESS - Always return success

-

---*/

-;

-

-EFI_STATUS

 CoreInitializeImageServices (

   IN  VOID *HobStart

   )

@@ -358,27 +338,6 @@ Returns:
 --*/

 ;

 

-EFI_STATUS

-CoreShutdownImageServices (

-  VOID

-  )

-/*++

-

-Routine Description:

-

-  Transfer control of runtime images to runtime service

-

-Arguments:

-

-  None

-

-Returns:

-

-  EFI_SUCCESS       - Function successfully returned

-

---*/

-;

-

 VOID

 CoreNotifyOnArchProtocolInstallation (

   VOID