summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2016-03-22 17:37:36 +0100
committerLaszlo Ersek <lersek@redhat.com>2016-03-23 12:06:04 +0100
commitdfc9514794fc8d43abc305411c86530c41823a58 (patch)
tree861d616a645d5fed69a3ab67df9a49514fd628a3
parent6212b9481d822a6765f8cd264ceb8454291948bd (diff)
downloadedk2-platforms-dfc9514794fc8d43abc305411c86530c41823a58.tar.xz
ArmVirtPkg/PlatformIntelBdsLib: rebase to EfiEventGroupSignal
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Quickly-acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
-rw-r--r--ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c34
-rw-r--r--ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h1
-rw-r--r--ArmVirtPkg/Library/PlatformIntelBdsLib/QemuKernel.c1
3 files changed, 2 insertions, 34 deletions
diff --git a/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
index b242a293a1..9267a188e8 100644
--- a/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
+++ b/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
@@ -121,24 +121,6 @@ STATIC PLATFORM_USB_KEYBOARD mUsbKeyboard = {
}
};
-/**
- An empty function to pass error checking of CreateEventEx ().
-
- @param Event Event whose notification function is being invoked.
- @param Context Pointer to the notification function's context,
- which is implementation-dependent.
-
-**/
-STATIC
-VOID
-EFIAPI
-EmptyCallbackFunction (
- IN EFI_EVENT Event,
- IN VOID *Context
- )
-{
-}
-
//
// BDS Platform Functions
//
@@ -153,24 +135,10 @@ PlatformBdsInit (
VOID
)
{
- EFI_EVENT EndOfDxeEvent;
- EFI_STATUS Status;
-
//
// Signal EndOfDxe PI Event
//
- Status = gBS->CreateEventEx (
- EVT_NOTIFY_SIGNAL,
- TPL_CALLBACK,
- EmptyCallbackFunction,
- NULL,
- &gEfiEndOfDxeEventGroupGuid,
- &EndOfDxeEvent
- );
- if (!EFI_ERROR (Status)) {
- gBS->SignalEvent (EndOfDxeEvent);
- gBS->CloseEvent (EndOfDxeEvent);
- }
+ EfiEventGroupSignal (&gEfiEndOfDxeEventGroupGuid);
}
diff --git a/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h b/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
index 3d29b0d099..190ce9b294 100644
--- a/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
+++ b/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h
@@ -22,6 +22,7 @@
#include <Library/DevicePathLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
VOID
diff --git a/ArmVirtPkg/Library/PlatformIntelBdsLib/QemuKernel.c b/ArmVirtPkg/Library/PlatformIntelBdsLib/QemuKernel.c
index c48f4767ad..402db97a80 100644
--- a/ArmVirtPkg/Library/PlatformIntelBdsLib/QemuKernel.c
+++ b/ArmVirtPkg/Library/PlatformIntelBdsLib/QemuKernel.c
@@ -20,7 +20,6 @@
#include <Guid/FileSystemVolumeLabelInfo.h>
#include <Library/PrintLib.h>
#include <Library/QemuFwCfgLib.h>
-#include <Library/UefiLib.h>
#include <Protocol/DevicePath.h>
#include <Protocol/LoadedImage.h>
#include <Protocol/SimpleFileSystem.h>