mirror of https://github.com/acidanthera/audk.git
Do not use statically macros of EFI_SPECIFICATION_VERSION: Use gST->Hdr.Revision to judge the use of UEFI 2.0 services or EFI 1.0 services
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6448 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
5405e9a66b
commit
c9c0c803ec
|
@ -190,8 +190,6 @@ Returns:
|
||||||
return EFI_SUCCESS;
|
return EFI_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
|
|
||||||
|
|
||||||
static
|
static
|
||||||
VOID
|
VOID
|
||||||
EFIAPI
|
EFIAPI
|
||||||
|
@ -211,7 +209,7 @@ EventNotifySignalAllNullEvent (
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
|
@ -245,7 +243,7 @@ Returns:
|
||||||
UINT32 EventType;
|
UINT32 EventType;
|
||||||
EFI_EVENT_NOTIFY WorkerNotifyFunction;
|
EFI_EVENT_NOTIFY WorkerNotifyFunction;
|
||||||
|
|
||||||
#if (EFI_SPECIFICATION_VERSION < 0x00020000)
|
if (gST->Hdr.Revision < 0x00020000) {
|
||||||
|
|
||||||
if (NotifyFunction == NULL) {
|
if (NotifyFunction == NULL) {
|
||||||
EventType = EFI_EVENT_SIGNAL_LEGACY_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL;
|
EventType = EFI_EVENT_SIGNAL_LEGACY_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL;
|
||||||
|
@ -264,7 +262,7 @@ Returns:
|
||||||
NotifyContext,
|
NotifyContext,
|
||||||
LegacyBootEvent
|
LegacyBootEvent
|
||||||
);
|
);
|
||||||
#else
|
} else {
|
||||||
|
|
||||||
EventType = EFI_EVENT_NOTIFY_SIGNAL;
|
EventType = EFI_EVENT_NOTIFY_SIGNAL;
|
||||||
if (NotifyFunction == NULL) {
|
if (NotifyFunction == NULL) {
|
||||||
|
@ -287,7 +285,8 @@ Returns:
|
||||||
&gEfiEventLegacyBootGuid,
|
&gEfiEventLegacyBootGuid,
|
||||||
LegacyBootEvent
|
LegacyBootEvent
|
||||||
);
|
);
|
||||||
#endif
|
}
|
||||||
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -324,7 +323,7 @@ Return:
|
||||||
UINT32 EventType;
|
UINT32 EventType;
|
||||||
EFI_EVENT_NOTIFY WorkerNotifyFunction;
|
EFI_EVENT_NOTIFY WorkerNotifyFunction;
|
||||||
|
|
||||||
#if (EFI_SPECIFICATION_VERSION < 0x00020000)
|
if (gST->Hdr.Revision < 0x00020000) {
|
||||||
|
|
||||||
if (NotifyFunction == NULL) {
|
if (NotifyFunction == NULL) {
|
||||||
EventType = EFI_EVENT_SIGNAL_READY_TO_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL;
|
EventType = EFI_EVENT_SIGNAL_READY_TO_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL;
|
||||||
|
@ -343,7 +342,7 @@ Return:
|
||||||
NotifyContext,
|
NotifyContext,
|
||||||
ReadyToBootEvent
|
ReadyToBootEvent
|
||||||
);
|
);
|
||||||
#else
|
} else {
|
||||||
|
|
||||||
EventType = EFI_EVENT_NOTIFY_SIGNAL;
|
EventType = EFI_EVENT_NOTIFY_SIGNAL;
|
||||||
if (NotifyFunction == NULL) {
|
if (NotifyFunction == NULL) {
|
||||||
|
@ -366,6 +365,6 @@ Return:
|
||||||
&gEfiEventReadyToBootGuid,
|
&gEfiEventReadyToBootGuid,
|
||||||
ReadyToBootEvent
|
ReadyToBootEvent
|
||||||
);
|
);
|
||||||
#endif
|
}
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue