Refine DxeReportStatusCodeLib and RuntimeDxeReportStatusCodeLib.

[mirror_edk2.git] / MdeModulePkg / Library / DxeReportStatusCodeLib / ReportStatusCodeLib.c

diff --git a/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c b/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
index f32e167d94a112a2090f54e4f26e352909e2ef66..8c456bebf48a58a3f49807472ce354bdc83f2674 100644 (file)
--- a/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/MdeModulePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
@@ -13,53 +13,56 @@
 **/\r
 \r
 #include <Library/ReportStatusCodeLib.h>\r
+#include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
-#include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
 #include <Library/PcdLib.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
 #include <Library/DevicePathLib.h>\r
 \r
+#include <Protocol/StatusCode.h>\r
+\r
 #include <Guid/StatusCodeDataTypeId.h>\r
 #include <Guid/StatusCodeDataTypeDebug.h>\r
-#include <Protocol/StatusCode.h>\r
 \r
-EFI_REPORT_STATUS_CODE  mReportStatusCode = NULL;\r
+EFI_STATUS_CODE_PROTOCOL  *mReportStatusCodeLibStatusCodeProtocol = NULL;\r
 \r
 /**\r
   Locate the report status code service.\r
 \r
-  @return   Function pointer to the report status code service.\r
-            NULL is returned if no status code service is available.\r
+  Retrieve ReportStatusCode() API of Report Status Code Protocol.\r
 \r
 **/\r
-EFI_REPORT_STATUS_CODE\r
+VOID\r
 InternalGetReportStatusCode (\r
   VOID\r
   )\r
 {\r
-  EFI_STATUS_CODE_PROTOCOL  *StatusCodeProtocol;\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
+\r
+  if (mReportStatusCodeLibStatusCodeProtocol != NULL) {\r
+    return;\r
+  }\r
 \r
+  //\r
+  // Check gBS just in case ReportStatusCode is called before gBS is initialized.\r
+  //\r
   if (gBS != NULL && gBS->LocateProtocol != NULL) {\r
-    Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID**)&StatusCodeProtocol);\r
-    if (!EFI_ERROR (Status) && StatusCodeProtocol != NULL) {\r
-      return StatusCodeProtocol->ReportStatusCode;\r
+    Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID**) &mReportStatusCodeLibStatusCodeProtocol);\r
+    if (EFI_ERROR (Status)) {\r
+      mReportStatusCodeLibStatusCodeProtocol = NULL;\r
     }\r
   }\r
-\r
-  return NULL;\r
 }\r
 \r
 /**\r
-  Internal worker function that reports a status code through the status code service.\r
+  Internal worker function that reports a status code through the Report Status Code Protocol.\r
 \r
-  If status code service is not cached, then this function checks if status code service is\r
-  available in system.  If status code service is not available, then EFI_UNSUPPORTED is\r
-  returned.  If status code service is present, then it is cached in mReportStatusCode.\r
-  Finally this function reports status code through the status code service.\r
+  If status code service is not cached, then this function checks if Report Status Code\r
+  Protocol is available in system.  If Report Status Code Protocol is not available, then\r
+  EFI_UNSUPPORTED is returned.  If Report Status Code Protocol is present, then it is\r
+  cached in mReportStatusCodeLibStatusCodeProtocol. Finally this function reports status\r
+  code through the Report Status Code Protocol.\r
 \r
   @param  Type              Status code type.\r
   @param  Value             Status code value.\r
@@ -71,7 +74,7 @@ InternalGetReportStatusCode (
                             optional parameter that may be NULL.\r
 \r
   @retval EFI_SUCCESS       The status code was reported.\r
-  @retval EFI_UNSUPPORTED   Status code service is not available.\r
+  @retval EFI_UNSUPPORTED   Report Status Code Protocol is not available.\r
   @retval EFI_UNSUPPORTED   Status code type is not supported.\r
 \r
 **/\r
@@ -88,19 +91,17 @@ InternalReportStatusCode (
       (ReportErrorCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) ||\r
       (ReportDebugCodeEnabled() && ((Type) & EFI_STATUS_CODE_TYPE_MASK) == EFI_DEBUG_CODE)) {\r
     //\r
-    // If mReportStatusCode is NULL, then check if status code service is available in system.\r
+    // If mReportStatusCodeLibStatusCodeProtocol is NULL, then check if Report Status Code Protocol is available in system.\r
     //\r
-    if (mReportStatusCode == NULL) {\r
-      mReportStatusCode = InternalGetReportStatusCode ();\r
-      if (mReportStatusCode == NULL) {\r
-        return EFI_UNSUPPORTED;\r
-      }\r
+    InternalGetReportStatusCode ();\r
+    if (mReportStatusCodeLibStatusCodeProtocol == NULL) {\r
+      return EFI_UNSUPPORTED;\r
     }\r
-  \r
+\r
     //\r
-    // A status code service is present in system, so pass in all the parameters to the service.\r
+    // A Report Status Code Protocol is present in system, so pass in all the parameters to the service.\r
     //\r
-    return (*mReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data);\r
+    return mReportStatusCodeLibStatusCodeProtocol->ReportStatusCode (Type, Value, Instance, (EFI_GUID *)CallerId, Data);\r
   }\r
   \r
   return EFI_UNSUPPORTED;\r