IntelFrameworkModulePkg: Put report status code after event was signaled per PI spec.

For PI spec vol3,
"EFI_SW_DXE_BS_PC_LEGACY_BOOT_EVENT   The event with GUID EFI_EVENT_LEGACY_BOOT_GUID was signaled."
"EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT The EFI_EVENT_GROUP_READY_TO_BOOT event was signaled."
However, in current code base, they are reported before events were signaled.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Elvin Li <elvin.li@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17124 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c
index 8120ef765d6809ad39d7980d4d18a7a4259cfac3..e51acd0551be21d8f09812f8325b2fb1997e1602 100644 (file)
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c
+++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBootSupport.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
@@ -1253,18 +1253,20 @@ GenericLegacyBoot (
   //\r
   EnableAllControllers (Private);\r
   if ((mBootMode == BOOT_LEGACY_OS) || (mBootMode == BOOT_UNCONVENTIONAL_DEVICE)) {\r
+\r
+    //\r
+    // Signal all the events that are waiting on EVT_SIGNAL_LEGACY_BOOT\r
+    //\r
+    EfiSignalEventLegacyBoot ();\r
+\r
     //\r
-    // Report Status Code to indicate legacy boot event will be signalled\r
+    // Report Status Code to indicate legacy boot event was signalled\r
     //\r
     REPORT_STATUS_CODE (\r
       EFI_PROGRESS_CODE,\r
       (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_LEGACY_BOOT_EVENT)\r
       );\r
 \r
-    //\r
-    // Signal all the events that are waiting on EVT_SIGNAL_LEGACY_BOOT\r
-    //\r
-    EfiSignalEventLegacyBoot ();\r
     DEBUG ((EFI_D_INFO, "Legacy INT19 Boot...\n"));\r
 \r
     //\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 33e2902197ce378bbfa92cbc5b78514247f68b3d..e02a71015edcbbd066447c1e4b92c2a284c33733 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -1,7 +1,7 @@
 /** @file\r
   BDS Lib functions which relate with create or process the boot option.\r
 \r
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -2283,14 +2283,14 @@ BdsLibBootViaBootOption (
   }\r
 \r
   //\r
-  // Report Status Code to indicate ReadyToBoot event will be signalled\r
+  // Signal the EVT_SIGNAL_READY_TO_BOOT event\r
   //\r
-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT));\r
+  EfiSignalEventReadyToBoot();\r
 \r
   //\r
-  // Signal the EVT_SIGNAL_READY_TO_BOOT event\r
+  // Report Status Code to indicate ReadyToBoot event was signalled\r
   //\r
-  EfiSignalEventReadyToBoot();\r
+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT));\r
 \r
   //\r
   // Expand USB Class or USB WWID device path node to be full device path of a USB\r