1. update the definitions in debug agent library, rename DEBUG_AGENT_INIT_DXE to...

2. disable debug timer interrupt in ExitBootServices().

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

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 2f72670c2a3fd5f71f8da4d72741ad9d47876515..2cf082b74f0f03f9a54b3873a14bd8382209d37f 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -244,7 +244,7 @@ DxeMain (
   //\r
   // Initialize Debug Agent to support source level debug in DXE phase\r
   //\r
-  InitializeDebugAgent (DEBUG_AGENT_INIT_DXE, HobStart);\r
+  InitializeDebugAgent (DEBUG_AGENT_INIT_DXE_CORE, HobStart);\r
 \r
   //\r
   // Initialize Memory Services\r
@@ -685,6 +685,11 @@ CoreExitBootServices (
   //\r
   CoreNotifySignalList (&gEfiEventExitBootServicesGuid);\r
 \r
+  //\r
+  // Disable interrupt of Debug timer.\r
+  //\r
+  SaveAndSetDebugTimerInterrupt (FALSE);\r
+\r
   //\r
   // Disable CPU Interrupts\r
   //\r

diff --git a/MdeModulePkg/Include/Library/DebugAgentLib.h b/MdeModulePkg/Include/Library/DebugAgentLib.h
index a5c311482d2f35e9aa179cc55e14e8768ee6b9ed..23671397298265a83f607e817e583df700ff659f 100644 (file)
--- a/MdeModulePkg/Include/Library/DebugAgentLib.h
+++ b/MdeModulePkg/Include/Library/DebugAgentLib.h
@@ -17,10 +17,11 @@
 \r
 #define DEBUG_AGENT_INIT_PREMEM_SEC      1\r
 #define DEBUG_AGENT_INIT_POSTMEM_SEC     2\r
-#define DEBUG_AGENT_INIT_DXE             3\r
+#define DEBUG_AGENT_INIT_DXE_CORE        3\r
 #define DEBUG_AGENT_INIT_SMM             4\r
 #define DEBUG_AGENT_INIT_ENTER_SMI       5\r
 #define DEBUG_AGENT_INIT_EXIT_SMI        6\r
+#define DEBUG_AGENT_INIT_S3              7\r
 \r
 /**\r
   Initialize debug agent.\r