1. Removed #ifndef to enable Capsule architecture protocol on IPF.

2. Added ASSERT (FLASE) in SwitchStack ().
3. Removed unreached branch from UefiNotTiano.c.

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

diff --git a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
index 51bc23ad3d422c3e046671f5ed11d64a331a9f9a..24ccc49a9b8c412fd6dd7ac5d1f396bd210724bb 100644 (file)
--- a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
+++ b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
@@ -43,12 +43,7 @@ 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
   { &gEfiRuntimeArchProtocolGuid,          (VOID **)&gRuntime,       NULL, NULL, FALSE },\r
   { &gEfiVariableArchProtocolGuid,         (VOID **)NULL,            NULL, NULL, FALSE },\r
   { &gEfiVariableWriteArchProtocolGuid,    (VOID **)NULL,            NULL, NULL, FALSE },\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
   { &gEfiCapsuleArchProtocolGuid,          (VOID **)NULL,            NULL, NULL, FALSE},\r

-#endif\r

   { &gEfiMonotonicCounterArchProtocolGuid, (VOID **)NULL,            NULL, NULL, FALSE },\r
   { &gEfiResetArchProtocolGuid,            (VOID **)NULL,            NULL, NULL, FALSE },\r
   { &gEfiRealTimeClockArchProtocolGuid,    (VOID **)NULL,            NULL, NULL, FALSE },\r
   { &gEfiMonotonicCounterArchProtocolGuid, (VOID **)NULL,            NULL, NULL, FALSE },\r
   { &gEfiResetArchProtocolGuid,            (VOID **)NULL,            NULL, NULL, FALSE },\r
   { &gEfiRealTimeClockArchProtocolGuid,    (VOID **)NULL,            NULL, NULL, FALSE },\r

diff --git a/MdePkg/Library/BaseLib/SwitchStack.c b/MdePkg/Library/BaseLib/SwitchStack.c
index 6b8d7af4b67a4c94cd54a2c2064c8500131be0ab..5dc21f547930f7ec42e7494f8907629645b3cb46 100644 (file)
--- a/MdePkg/Library/BaseLib/SwitchStack.c
+++ b/MdePkg/Library/BaseLib/SwitchStack.c
@@ -58,5 +58,8 @@ SwitchStack (
 \r
   InternalSwitchStack (EntryPoint, Context1, Context2, NewStack, Marker);\r
 \r
 \r
   InternalSwitchStack (EntryPoint, Context1, Context2, NewStack, Marker);\r
 \r

-  VA_END (Marker);\r
+  //\r
+  // InternalSwitchStack () will never return\r
+  //\r
+  ASSERT (FALSE);\r

 }\r
 }\r

diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c
index 33a14522a9edc933cc1b073ab3367240447fae2c..081e25439e8cffc9f929509e9a8020bb260e672c 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/MdePkg/Library/UefiLib/UefiNotTiano.c
@@ -109,7 +109,7 @@ EfiCreateEventLegacyBootEx (
                     NotifyContext,\r
                     LegacyBootEvent\r
                     );\r
                     NotifyContext,\r
                     LegacyBootEvent\r
                     );\r

-  } else if (gST->Hdr.Revision >= 0x00020000 ) {\r
+  } else {\r

     //\r
     // For UEFI 2.0 and the future use an Event Group\r
     //\r
     //\r
     // For UEFI 2.0 and the future use an Event Group\r
     //\r


@@ -121,11 +121,6 @@ EfiCreateEventLegacyBootEx (
                     &gEfiEventLegacyBootGuid,\r
                     LegacyBootEvent\r
                     );\r
                     &gEfiEventLegacyBootGuid,\r
                     LegacyBootEvent\r
                     );\r

-  } else {\r
-    //\r
-    // For EFI 1.10 with no Tiano extensions return unsupported\r
-    //\r
-    Status = EFI_UNSUPPORTED;\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -204,7 +199,7 @@ EfiCreateEventReadyToBootEx (
                     NotifyContext,\r
                     ReadyToBootEvent\r
                     );\r
                     NotifyContext,\r
                     ReadyToBootEvent\r
                     );\r

-  } else if (gST->Hdr.Revision >= 0x00020000) {\r
+  } else {\r

     //\r
     // For UEFI 2.0 and the future use an Event Group\r
     //\r
     //\r
     // For UEFI 2.0 and the future use an Event Group\r
     //\r


@@ -216,11 +211,6 @@ EfiCreateEventReadyToBootEx (
                     &gEfiEventReadyToBootGuid,\r
                     ReadyToBootEvent\r
                     );\r
                     &gEfiEventReadyToBootGuid,\r
                     ReadyToBootEvent\r
                     );\r

-  } else {\r
-    //\r
-    // For EFI 1.10 with no Tiano extensions return unsupported\r
-    //\r
-    Status = EFI_UNSUPPORTED;\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r