Use EfiEventGroupSignal from UefiLib and remove EmptyCallbackFunction. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=298
Cc: Leif Lindholm <leif.lindh...@linaro.org> Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> Cc: Liming Gao <liming....@intel.com> Cc: Michael Kinney <michael.d.kin...@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <star.z...@intel.com> --- .../Library/PlatformIntelBdsLib/IntelBdsPlatform.c | 36 ++-------------------- .../Library/PlatformIntelBdsLib/IntelBdsPlatform.h | 3 +- .../PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 3 +- 3 files changed, 6 insertions(+), 36 deletions(-) diff --git a/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c index ceb4f076e2a6..885866854329 100644 --- a/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c +++ b/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR> Copyright (c) 2014, ARM Ltd. All rights reserved.<BR> This program and the accompanying materials @@ -31,24 +31,6 @@ PlatformIntelBdsConstructor ( return EFI_SUCCESS; } -/** - 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 // @@ -63,24 +45,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); } STATIC diff --git a/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h b/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h index da428288fb9f..1329c54a1c3a 100644 --- a/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h +++ b/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h @@ -1,7 +1,7 @@ /** @file Head file for BDS Platform specific code -Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -28,6 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Library/PcdLib.h> #include <Library/GenericBdsLib.h> #include <Library/PlatformBdsLib.h> +#include <Library/UefiLib.h> #include <Guid/GlobalVariable.h> #include <Guid/EventGroup.h> diff --git a/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf b/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf index daa0d91a2f76..a27adacbc1c2 100644 --- a/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf +++ b/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf @@ -2,7 +2,7 @@ # Implementation for PlatformBdsLib library class interfaces. # using ARM Platform framework. # -# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2014, ARM Ltd. All rights reserved.<BR> # # This program and the accompanying materials @@ -50,6 +50,7 @@ [LibraryClasses] UefiBootServicesTableLib PcdLib GenericBdsLib + UefiLib [Guids] gEfiEndOfDxeEventGroupGuid -- 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel