Revert back the change. For now, ECP only support build mode with EFI_SPECIFICATION_V...

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / Dxe / EfiDriverLib / ReportStatusCode.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/ReportStatusCode.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/ReportStatusCode.c
index 4c071f2dbea6a6f5412e4346904d3bca4b520610..a8145cd28aec3fd121517bbecd5e2ccbe3f8a4c6 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/ReportStatusCode.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/ReportStatusCode.c
@@ -23,7 +23,9 @@ Abstract:
 #include EFI_GUID_DEFINITION (StatusCodeDataTypeId)\r
 #include EFI_ARCH_PROTOCOL_DEFINITION (StatusCode)\r
 \r
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 STATIC EFI_STATUS_CODE_PROTOCOL  *gStatusCode = NULL;\r
+#endif\r
 \r
 EFI_STATUS\r
 EfiLibReportStatusCode (\r
@@ -56,37 +58,34 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS  Status;\r
-  \r
-  Status = EFI_UNSUPPORTED;\r
 \r
-  if (gRT->Hdr.Revision >= 0x00020000) {\r
-         if (gStatusCode == NULL) {\r
-           if (gBS == NULL) {\r
-             return EFI_UNSUPPORTED;\r
-           }\r
-           Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID **)&gStatusCode);\r
-           if (EFI_ERROR (Status) || gStatusCode == NULL) {\r
-             return EFI_UNSUPPORTED;\r
-           }\r
-         }\r
-         Status = gStatusCode->ReportStatusCode (Type, Value, Instance, CallerId, Data);\r
-       } else {\r
-         if (gRT == NULL) {\r
-           return EFI_UNSUPPORTED;\r
-         }\r
-         //\r
-         // Check whether EFI_RUNTIME_SERVICES has Tiano Extension\r
-         //\r
-         Status = EFI_UNSUPPORTED;\r
-#if (EFI_SPECIFICATION_VERSION < 0x00020000)\r
-         if (gRT->Hdr.Revision     == EFI_SPECIFICATION_VERSION     &&\r
-             gRT->Hdr.HeaderSize   == sizeof (EFI_RUNTIME_SERVICES) &&\r
-             gRT->ReportStatusCode != NULL) {\r
-           Status = gRT->ReportStatusCode (Type, Value, Instance, CallerId, Data);\r
-#endif\r
-         }\r
-       }\r
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000) \r
+  if (gStatusCode == NULL) {\r
+    if (gBS == NULL) {\r
+      return EFI_UNSUPPORTED;\r
+    }\r
+    Status = gBS->LocateProtocol (&gEfiStatusCodeRuntimeProtocolGuid, NULL, (VOID **)&gStatusCode);\r
+    if (EFI_ERROR (Status) || gStatusCode == NULL) {\r
+      return EFI_UNSUPPORTED;\r
+    }\r
+  }\r
+  Status = gStatusCode->ReportStatusCode (Type, Value, Instance, CallerId, Data);\r
   return Status;\r
+#else\r
+  if (gRT == NULL) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+  //\r
+  // Check whether EFI_RUNTIME_SERVICES has Tiano Extension\r
+  //\r
+  Status = EFI_UNSUPPORTED;\r
+  if (gRT->Hdr.Revision     == EFI_SPECIFICATION_VERSION     &&\r
+      gRT->Hdr.HeaderSize   == sizeof (EFI_RUNTIME_SERVICES) &&\r
+      gRT->ReportStatusCode != NULL) {\r
+    Status = gRT->ReportStatusCode (Type, Value, Instance, CallerId, Data);\r
+  }\r
+  return Status;\r
+#endif\r
 }\r
 \r
 EFI_STATUS\r