IntelFrameworkModulePkg/GenericBdsLib: update GenericBdsLib to report status code...

Signed-off-by: xdu2
Reviewed-by: lgao4
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12211 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index a697fcfda38082125f2eee207603e210dd34574b..58f058df805d3af53161661f9c8bb5df0d04ff90 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -450,6 +450,7 @@ BdsFindUsbDevice (
         // could be installed for this USB device.\r
         //\r
         BdsLibConnectDevicePath (FullDevicePath);\r
+        REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderLoad));\r
         Status = gBS->LoadImage (\r
                        TRUE,\r
                        gImageHandle,\r
@@ -483,6 +484,7 @@ BdsFindUsbDevice (
         //\r
         FullDevicePath = FileDevicePath (Handle, EFI_REMOVABLE_MEDIA_FILE_NAME);\r
         if (FullDevicePath != NULL) {\r
+          REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderLoad));\r
           Status = gBS->LoadImage (\r
                           TRUE,\r
                           gImageHandle,\r
@@ -753,6 +755,10 @@ BdsLibBootViaBootOption (
         \r
     DEBUG_CODE_END();\r
   \r
+    //\r
+    // Report status code for OS Loader LoadImage.\r
+    //\r
+    REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderLoad));\r
     Status = gBS->LoadImage (\r
                     TRUE,\r
                     gImageHandle,\r
@@ -781,6 +787,7 @@ BdsLibBootViaBootOption (
       //\r
       FilePath = FileDevicePath (Handle, EFI_REMOVABLE_MEDIA_FILE_NAME);\r
       if (FilePath != NULL) {\r
+        REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderLoad));\r
         Status = gBS->LoadImage (\r
                         TRUE,\r
                         gImageHandle,\r
@@ -832,6 +839,11 @@ BdsLibBootViaBootOption (
     WriteBootToOsPerformanceData ();\r
   );\r
 \r
+  //\r
+  // Report status code for OS Loader StartImage.\r
+  //\r
+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderStart));\r
+\r
   Status = gBS->StartImage (ImageHandle, ExitDataSize, ExitData);\r
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n", Status));\r
 \r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index eb41f57123d0213a1c01b4e977b7b39dfeaa7bee..e460f70a8049dfc82fa547366b78e84fa1dff69d 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -5,7 +5,7 @@
 #  2) BDS boot device connect interface;\r
 #  3) BDS Misc interfaces for mainting boot variable, ouput string, etc.\r
 #  \r
-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2011, 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
@@ -68,6 +68,7 @@
   TimerLib\r
   DxeServicesLib\r
   HiiLib\r
+  ReportStatusCodeLib\r
 \r
 [Guids]\r
   gEfiVT100PlusGuid                             ## CONSUMES ## GUID (The type of terminal)\r
@@ -117,4 +118,6 @@
 \r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
\ No newline at end of file
+  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index 0e25046fe2d561b3ce78fd5ba95c9a70d76c86cc..82cfe75f225715d4b060900a630aff974d9e8ce7 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   BDS library definition, include the file and data structure\r
 \r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2011, 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
@@ -66,6 +66,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/TimerLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/DxeServicesLib.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
 \r
 #if !defined (EFI_REMOVABLE_MEDIA_FILE_NAME)\r
     #if defined (MDE_CPU_EBC)\r