mirror of https://github.com/acidanthera/audk.git
Revert previous check in. ECP is only supposed to support UEFI 2.0.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6450 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
c76a83cc63
commit
dd4a462dcb
|
@ -190,6 +190,8 @@ Returns:
|
||||||
return EFI_SUCCESS;
|
return EFI_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
|
||||||
|
|
||||||
static
|
static
|
||||||
VOID
|
VOID
|
||||||
EFIAPI
|
EFIAPI
|
||||||
|
@ -209,7 +211,7 @@ EventNotifySignalAllNullEvent (
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
EFI_STATUS
|
EFI_STATUS
|
||||||
EFIAPI
|
EFIAPI
|
||||||
|
@ -243,50 +245,49 @@ Returns:
|
||||||
UINT32 EventType;
|
UINT32 EventType;
|
||||||
EFI_EVENT_NOTIFY WorkerNotifyFunction;
|
EFI_EVENT_NOTIFY WorkerNotifyFunction;
|
||||||
|
|
||||||
if (gST->Hdr.Revision < 0x00020000) {
|
#if (EFI_SPECIFICATION_VERSION < 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;
|
||||||
} else {
|
|
||||||
EventType = EFI_EVENT_SIGNAL_LEGACY_BOOT;
|
|
||||||
}
|
|
||||||
WorkerNotifyFunction = NotifyFunction;
|
|
||||||
|
|
||||||
//
|
|
||||||
// prior to UEFI 2.0 use Tiano extension to EFI
|
|
||||||
//
|
|
||||||
Status = gBS->CreateEvent (
|
|
||||||
EventType,
|
|
||||||
NotifyTpl,
|
|
||||||
WorkerNotifyFunction,
|
|
||||||
NotifyContext,
|
|
||||||
LegacyBootEvent
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
|
EventType = EFI_EVENT_SIGNAL_LEGACY_BOOT;
|
||||||
EventType = EFI_EVENT_NOTIFY_SIGNAL;
|
}
|
||||||
if (NotifyFunction == NULL) {
|
WorkerNotifyFunction = NotifyFunction;
|
||||||
//
|
|
||||||
// CreatEventEx will check NotifyFunction is NULL or not
|
//
|
||||||
//
|
// prior to UEFI 2.0 use Tiano extension to EFI
|
||||||
WorkerNotifyFunction = EventNotifySignalAllNullEvent;
|
//
|
||||||
} else {
|
Status = gBS->CreateEvent (
|
||||||
WorkerNotifyFunction = NotifyFunction;
|
EventType,
|
||||||
}
|
NotifyTpl,
|
||||||
|
WorkerNotifyFunction,
|
||||||
|
NotifyContext,
|
||||||
|
LegacyBootEvent
|
||||||
|
);
|
||||||
|
#else
|
||||||
|
|
||||||
|
EventType = EFI_EVENT_NOTIFY_SIGNAL;
|
||||||
|
if (NotifyFunction == NULL) {
|
||||||
//
|
//
|
||||||
// For UEFI 2.0 and the future use an Event Group
|
// CreatEventEx will check NotifyFunction is NULL or not
|
||||||
//
|
//
|
||||||
Status = gBS->CreateEventEx (
|
WorkerNotifyFunction = EventNotifySignalAllNullEvent;
|
||||||
EventType,
|
} else {
|
||||||
NotifyTpl,
|
WorkerNotifyFunction = NotifyFunction;
|
||||||
WorkerNotifyFunction,
|
|
||||||
NotifyContext,
|
|
||||||
&gEfiEventLegacyBootGuid,
|
|
||||||
LegacyBootEvent
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// For UEFI 2.0 and the future use an Event Group
|
||||||
|
//
|
||||||
|
Status = gBS->CreateEventEx (
|
||||||
|
EventType,
|
||||||
|
NotifyTpl,
|
||||||
|
WorkerNotifyFunction,
|
||||||
|
NotifyContext,
|
||||||
|
&gEfiEventLegacyBootGuid,
|
||||||
|
LegacyBootEvent
|
||||||
|
);
|
||||||
|
#endif
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -323,48 +324,48 @@ Return:
|
||||||
UINT32 EventType;
|
UINT32 EventType;
|
||||||
EFI_EVENT_NOTIFY WorkerNotifyFunction;
|
EFI_EVENT_NOTIFY WorkerNotifyFunction;
|
||||||
|
|
||||||
if (gST->Hdr.Revision < 0x00020000) {
|
#if (EFI_SPECIFICATION_VERSION < 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;
|
||||||
} else {
|
|
||||||
EventType = EFI_EVENT_SIGNAL_READY_TO_BOOT;
|
|
||||||
}
|
|
||||||
WorkerNotifyFunction = NotifyFunction;
|
|
||||||
|
|
||||||
//
|
|
||||||
// prior to UEFI 2.0 use Tiano extension to EFI
|
|
||||||
//
|
|
||||||
Status = gBS->CreateEvent (
|
|
||||||
EventType,
|
|
||||||
NotifyTpl,
|
|
||||||
WorkerNotifyFunction,
|
|
||||||
NotifyContext,
|
|
||||||
ReadyToBootEvent
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
|
EventType = EFI_EVENT_SIGNAL_READY_TO_BOOT;
|
||||||
EventType = EFI_EVENT_NOTIFY_SIGNAL;
|
|
||||||
if (NotifyFunction == NULL) {
|
|
||||||
//
|
|
||||||
// CreatEventEx will check NotifyFunction is NULL or not
|
|
||||||
//
|
|
||||||
WorkerNotifyFunction = EventNotifySignalAllNullEvent;
|
|
||||||
} else {
|
|
||||||
WorkerNotifyFunction = NotifyFunction;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// For UEFI 2.0 and the future use an Event Group
|
|
||||||
//
|
|
||||||
Status = gBS->CreateEventEx (
|
|
||||||
EventType,
|
|
||||||
NotifyTpl,
|
|
||||||
WorkerNotifyFunction,
|
|
||||||
NotifyContext,
|
|
||||||
&gEfiEventReadyToBootGuid,
|
|
||||||
ReadyToBootEvent
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
WorkerNotifyFunction = NotifyFunction;
|
||||||
|
|
||||||
|
//
|
||||||
|
// prior to UEFI 2.0 use Tiano extension to EFI
|
||||||
|
//
|
||||||
|
Status = gBS->CreateEvent (
|
||||||
|
EventType,
|
||||||
|
NotifyTpl,
|
||||||
|
WorkerNotifyFunction,
|
||||||
|
NotifyContext,
|
||||||
|
ReadyToBootEvent
|
||||||
|
);
|
||||||
|
#else
|
||||||
|
|
||||||
|
EventType = EFI_EVENT_NOTIFY_SIGNAL;
|
||||||
|
if (NotifyFunction == NULL) {
|
||||||
|
//
|
||||||
|
// CreatEventEx will check NotifyFunction is NULL or not
|
||||||
|
//
|
||||||
|
WorkerNotifyFunction = EventNotifySignalAllNullEvent;
|
||||||
|
} else {
|
||||||
|
WorkerNotifyFunction = NotifyFunction;
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// For UEFI 2.0 and the future use an Event Group
|
||||||
|
//
|
||||||
|
Status = gBS->CreateEventEx (
|
||||||
|
EventType,
|
||||||
|
NotifyTpl,
|
||||||
|
WorkerNotifyFunction,
|
||||||
|
NotifyContext,
|
||||||
|
&gEfiEventReadyToBootGuid,
|
||||||
|
ReadyToBootEvent
|
||||||
|
);
|
||||||
|
#endif
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue