1. Removed #ifdef EDK_RELEASE_VERSION from all c files for all modules

[mirror_edk2.git] / EdkModulePkg / Core / Dxe / DxeMain / DxeProtocolNotify.c

diff --git a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
index b485210aef06096624cd517db7eb48d621441584..51bc23ad3d422c3e046671f5ed11d64a331a9f9a 100644 (file)
--- a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
+++ b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation\r
+Copyright (c) 2006 - 2007, Intel Corporation\r
 All rights reserved. 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
@@ -43,25 +43,14 @@ ARCHITECTURAL_PROTOCOL_ENTRY  mArchProtocols[] = {
   { &gEfiRuntimeArchProtocolGuid,          (VOID **)&gRuntime,       NULL, NULL, FALSE },\r
   { &gEfiVariableArchProtocolGuid,         (VOID **)NULL,            NULL, NULL, FALSE },\r
   { &gEfiVariableWriteArchProtocolGuid,    (VOID **)NULL,            NULL, NULL, FALSE },\r
-#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
 #ifndef MDE_CPU_IPF\r
   //\r
   // UEFI 2.0 added support for Capsule services. DXE CIS ??? Added support for this AP\r
   //\r
   { &gEfiCapsuleArchProtocolGuid,          (VOID **)NULL,            NULL, NULL, FALSE},\r
-#endif\r
 #endif\r
   { &gEfiMonotonicCounterArchProtocolGuid, (VOID **)NULL,            NULL, NULL, FALSE },\r
   { &gEfiResetArchProtocolGuid,            (VOID **)NULL,            NULL, NULL, FALSE },\r
-#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION <  0x00020000))\r
-  //\r
-  // The ReportStatusCode Runtime service is in conflict with the UEFI 2.0 specificaiton\r
-  // Thus gEfiStatusCodeRuntimeProtocolGuid becomes a normal protocol in UEFI 2.0 systems\r
-  // It is only included if the EFI 1.10 with Tiano extensions is enabled for backward\r
-  // compatability\r
-  //\r
-  { &gEfiStatusCodeRuntimeProtocolGuid,    (VOID **)&gStatusCode,    NULL, NULL, FALSE },\r
-#endif\r
   { &gEfiRealTimeClockArchProtocolGuid,    (VOID **)NULL,            NULL, NULL, FALSE },\r
   { NULL,                                  (VOID **)NULL,            NULL, NULL, FALSE }\r
 };\r
@@ -182,7 +171,7 @@ Returns:
         CopyMem (&TempLinkNode, Link, sizeof(LIST_ENTRY));\r
         InsertTailList (&gRuntime->EventHead, Link);\r
       }\r
-      \r
+\r
       //\r
       // Clean up gRuntimeTemplate\r
       //\r
@@ -271,9 +260,7 @@ static const GUID_TO_STRING_PROTOCOL_ENTRY MissingProtocols[] = {
   { &gEfiRuntimeArchProtocolGuid,          (CHAR16 *)L"Runtime"            },\r
   { &gEfiVariableArchProtocolGuid,         (CHAR16 *)L"Variable"           },\r
   { &gEfiVariableWriteArchProtocolGuid,    (CHAR16 *)L"Variable Write"     },\r
-  #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
   { &gEfiCapsuleArchProtocolGuid,          (CHAR16 *)L"Capsule"            },\r
-  #endif\r
   { &gEfiMonotonicCounterArchProtocolGuid, (CHAR16 *)L"Monotonic Counter"  },\r
   { &gEfiResetArchProtocolGuid,            (CHAR16 *)L"Reset"              },\r
 //  { &gEfiStatusCodeRuntimeProtocolGuid,       (CHAR16 *)L"Status Code"        },\r