summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2007-03-28 03:28:13 +0000
committervanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2007-03-28 03:28:13 +0000
commit0f6b6f755b09f5bb386bb41fa21cc75f58a624d2 (patch)
tree3136e05aa07796e08d643473594257f4d2921787
parent1f740941616eecce0e86b119799c1aaa00556080 (diff)
downloadedk2-platforms-0f6b6f755b09f5bb386bb41fa21cc75f58a624d2.tar.xz
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
-rw-r--r--EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c5
-rw-r--r--MdePkg/Library/BaseLib/SwitchStack.c5
-rw-r--r--MdePkg/Library/UefiLib/UefiNotTiano.c14
3 files changed, 6 insertions, 18 deletions
diff --git a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
index 51bc23ad3d..24ccc49a9b 100644
--- 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 },
{ &gEfiVariableArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
{ &gEfiVariableWriteArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
-#ifndef MDE_CPU_IPF
- //
- // UEFI 2.0 added support for Capsule services. DXE CIS ??? Added support for this AP
- //
{ &gEfiCapsuleArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE},
-#endif
{ &gEfiMonotonicCounterArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
{ &gEfiResetArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
{ &gEfiRealTimeClockArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
diff --git a/MdePkg/Library/BaseLib/SwitchStack.c b/MdePkg/Library/BaseLib/SwitchStack.c
index 6b8d7af4b6..5dc21f5479 100644
--- a/MdePkg/Library/BaseLib/SwitchStack.c
+++ b/MdePkg/Library/BaseLib/SwitchStack.c
@@ -58,5 +58,8 @@ SwitchStack (
InternalSwitchStack (EntryPoint, Context1, Context2, NewStack, Marker);
- VA_END (Marker);
+ //
+ // InternalSwitchStack () will never return
+ //
+ ASSERT (FALSE);
}
diff --git a/MdePkg/Library/UefiLib/UefiNotTiano.c b/MdePkg/Library/UefiLib/UefiNotTiano.c
index 33a14522a9..081e25439e 100644
--- a/MdePkg/Library/UefiLib/UefiNotTiano.c
+++ b/MdePkg/Library/UefiLib/UefiNotTiano.c
@@ -109,7 +109,7 @@ EfiCreateEventLegacyBootEx (
NotifyContext,
LegacyBootEvent
);
- } else if (gST->Hdr.Revision >= 0x00020000 ) {
+ } else {
//
// For UEFI 2.0 and the future use an Event Group
//
@@ -121,11 +121,6 @@ EfiCreateEventLegacyBootEx (
&gEfiEventLegacyBootGuid,
LegacyBootEvent
);
- } else {
- //
- // For EFI 1.10 with no Tiano extensions return unsupported
- //
- Status = EFI_UNSUPPORTED;
}
return Status;
@@ -204,7 +199,7 @@ EfiCreateEventReadyToBootEx (
NotifyContext,
ReadyToBootEvent
);
- } else if (gST->Hdr.Revision >= 0x00020000) {
+ } else {
//
// For UEFI 2.0 and the future use an Event Group
//
@@ -216,11 +211,6 @@ EfiCreateEventReadyToBootEx (
&gEfiEventReadyToBootGuid,
ReadyToBootEvent
);
- } else {
- //
- // For EFI 1.10 with no Tiano extensions return unsupported
- //
- Status = EFI_UNSUPPORTED;
}
return Status;