mirror of https://github.com/acidanthera/audk.git
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
This commit is contained in:
parent
1f74094161
commit
0f6b6f755b
|
@ -43,12 +43,7 @@ ARCHITECTURAL_PROTOCOL_ENTRY mArchProtocols[] = {
|
||||||
{ &gEfiRuntimeArchProtocolGuid, (VOID **)&gRuntime, NULL, NULL, FALSE },
|
{ &gEfiRuntimeArchProtocolGuid, (VOID **)&gRuntime, NULL, NULL, FALSE },
|
||||||
{ &gEfiVariableArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
|
{ &gEfiVariableArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
|
||||||
{ &gEfiVariableWriteArchProtocolGuid, (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},
|
{ &gEfiCapsuleArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE},
|
||||||
#endif
|
|
||||||
{ &gEfiMonotonicCounterArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
|
{ &gEfiMonotonicCounterArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
|
||||||
{ &gEfiResetArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
|
{ &gEfiResetArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
|
||||||
{ &gEfiRealTimeClockArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
|
{ &gEfiRealTimeClockArchProtocolGuid, (VOID **)NULL, NULL, NULL, FALSE },
|
||||||
|
|
|
@ -58,5 +58,8 @@ SwitchStack (
|
||||||
|
|
||||||
InternalSwitchStack (EntryPoint, Context1, Context2, NewStack, Marker);
|
InternalSwitchStack (EntryPoint, Context1, Context2, NewStack, Marker);
|
||||||
|
|
||||||
VA_END (Marker);
|
//
|
||||||
|
// InternalSwitchStack () will never return
|
||||||
|
//
|
||||||
|
ASSERT (FALSE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -109,7 +109,7 @@ EfiCreateEventLegacyBootEx (
|
||||||
NotifyContext,
|
NotifyContext,
|
||||||
LegacyBootEvent
|
LegacyBootEvent
|
||||||
);
|
);
|
||||||
} else if (gST->Hdr.Revision >= 0x00020000 ) {
|
} else {
|
||||||
//
|
//
|
||||||
// For UEFI 2.0 and the future use an Event Group
|
// For UEFI 2.0 and the future use an Event Group
|
||||||
//
|
//
|
||||||
|
@ -121,11 +121,6 @@ EfiCreateEventLegacyBootEx (
|
||||||
&gEfiEventLegacyBootGuid,
|
&gEfiEventLegacyBootGuid,
|
||||||
LegacyBootEvent
|
LegacyBootEvent
|
||||||
);
|
);
|
||||||
} else {
|
|
||||||
//
|
|
||||||
// For EFI 1.10 with no Tiano extensions return unsupported
|
|
||||||
//
|
|
||||||
Status = EFI_UNSUPPORTED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return Status;
|
return Status;
|
||||||
|
@ -204,7 +199,7 @@ EfiCreateEventReadyToBootEx (
|
||||||
NotifyContext,
|
NotifyContext,
|
||||||
ReadyToBootEvent
|
ReadyToBootEvent
|
||||||
);
|
);
|
||||||
} else if (gST->Hdr.Revision >= 0x00020000) {
|
} else {
|
||||||
//
|
//
|
||||||
// For UEFI 2.0 and the future use an Event Group
|
// For UEFI 2.0 and the future use an Event Group
|
||||||
//
|
//
|
||||||
|
@ -216,11 +211,6 @@ EfiCreateEventReadyToBootEx (
|
||||||
&gEfiEventReadyToBootGuid,
|
&gEfiEventReadyToBootGuid,
|
||||||
ReadyToBootEvent
|
ReadyToBootEvent
|
||||||
);
|
);
|
||||||
} else {
|
|
||||||
//
|
|
||||||
// For EFI 1.10 with no Tiano extensions return unsupported
|
|
||||||
//
|
|
||||||
Status = EFI_UNSUPPORTED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return Status;
|
return Status;
|
||||||
|
|
Loading…
Reference in New Issue