From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 23 Feb 2009 14:31:09 +0000 (+0000)
Subject: Add conditional check before output status code.
X-Git-Tag: edk2-stable201903~18647
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=15cd6a822c3b96cc3d5e12d4ec271b686e7d0bd8

Add conditional check before output status code.

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

diff --git a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
index f29831563c..9e35cdda90 100644
--- a/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/ReportStatusCodeLib.c
@@ -48,22 +48,28 @@ InternalReportStatusCode (
   IN EFI_STATUS_CODE_DATA     *Data     OPTIONAL
   )
 {
-  //
-  // If gStatusCode is NULL, then see if a Status Code Protocol instance is present
-  // in the handle database.
-  //
-  if (mReportStatusCode == NULL) {
-    mReportStatusCode = InternalGetReportStatusCode ();
+  if ((ReportProgressCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) ||
+    (ReportErrorCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) ||
+    (ReportDebugCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_DEBUG_CODE)) {
+    //
+    // If gStatusCode is NULL, then see if a Status Code Protocol instance is present
+    // in the handle database.
+    //
     if (mReportStatusCode == NULL) {
-      return EFI_UNSUPPORTED;
+      mReportStatusCode = InternalGetReportStatusCode ();
+      if (mReportStatusCode == NULL) {
+        return EFI_UNSUPPORTED;
+      }
     }
+  
+    //
+    // A Status Code Protocol is present in the handle database, so pass in all the
+    // parameters to the ReportStatusCode() service of the Status Code Protocol
+    //
+    return (*mReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data);
   }
-
-  //
-  // A Status Code Protocol is present in the handle database, so pass in all the
-  // parameters to the ReportStatusCode() service of the Status Code Protocol
-  //
-  return (*mReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data);
+  
+  return EFI_UNSUPPORTED;
 }
 
 
diff --git a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
index f39f36d6b6..d027dc4a8e 100644
--- a/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/IntelFrameworkModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c
@@ -67,22 +67,28 @@ InternalReportStatusCode (
   CONST EFI_PEI_SERVICES  **PeiServices;
   EFI_STATUS              Status;
 
-  PeiServices = GetPeiServicesTablePointer ();
-  Status =  (*PeiServices)->ReportStatusCode (
-                             PeiServices,
-                             Type,
-                             Value,
-                             Instance,
-                             (EFI_GUID *)CallerId,
-                             Data
-                             );
-  if (Status == EFI_NOT_AVAILABLE_YET) {
-    Status = OemHookStatusCodeInitialize ();
-    if (!EFI_ERROR (Status)) {
-      return OemHookStatusCodeReport (Type, Value, Instance, (EFI_GUID *) CallerId, Data);
+  if ((ReportProgressCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) ||
+    (ReportErrorCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) ||
+    (ReportDebugCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_DEBUG_CODE)) {
+    PeiServices = GetPeiServicesTablePointer ();
+    Status =  (*PeiServices)->ReportStatusCode (
+                               PeiServices,
+                               Type,
+                               Value,
+                               Instance,
+                               (EFI_GUID *)CallerId,
+                               Data
+                               );
+    if (Status == EFI_NOT_AVAILABLE_YET) {
+      Status = OemHookStatusCodeInitialize ();
+      if (!EFI_ERROR (Status)) {
+        return OemHookStatusCodeReport (Type, Value, Instance, (EFI_GUID *) CallerId, Data);
+      }
     }
+    return Status;
   }
-  return Status;
+
+  return EFI_UNSUPPORTED;
 }