From ff55dd3befb43cbbf6c69513eadada79c8e984f9 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 22 Mar 2016 17:01:22 +0100 Subject: [PATCH] IntelFrameworkPkg/FrameworkUefiLib: move InternalEmptyFunction to UefiLib.c The InternalEmptyFunction() is currently only used by code in "UefiNotTiano.c" -- "Library functions that abstract areas of conflict between framework and UEFI 2.0.". In the next patches, InternalEmptyFunction() will be used from "UefiLib.c" as well, hence promote it to "general utility" status: move the function definition to "UefiLib.c", and place the function declaration (which is already extern) into "UefiLibInternal.h". Fix a typo in the function's name while at it. Cc: Michael D Kinney Cc: Jeff Fan Cc: Jordan Justen Cc: Ard Biesheuvel Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Jordan Justen Reviewed-by: Liming Gao --- .../Library/FrameworkUefiLib/UefiLib.c | 19 ++++++++++++++ .../FrameworkUefiLib/UefiLibInternal.h | 18 +++++++++++++ .../Library/FrameworkUefiLib/UefiNotTiano.c | 25 ++----------------- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c index 554af2281e..9f73fb52ed 100644 --- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c @@ -1415,3 +1415,22 @@ GetBestLanguage ( return NULL; } +/** + An empty function to pass error checking of CreateEventEx (). + + This empty function ensures that EVT_NOTIFY_SIGNAL_ALL is error + checked correctly since it is now mapped into CreateEventEx() in UEFI 2.0. + + @param Event Event whose notification function is being invoked. + @param Context Pointer to the notification function's context, + which is implementation-dependent. + +**/ +VOID +EFIAPI +InternalEmptyFunction ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ +} diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibInternal.h b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibInternal.h index e4bc433be4..16c663626d 100644 --- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibInternal.h +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibInternal.h @@ -41,4 +41,22 @@ #include #include +/** + An empty function to pass error checking of CreateEventEx (). + + This empty function ensures that EVT_NOTIFY_SIGNAL_ALL is error + checked correctly since it is now mapped into CreateEventEx() in UEFI 2.0. + + @param Event Event whose notification function is being invoked. + @param Context Pointer to the notification function's context, + which is implementation-dependent. + +**/ +VOID +EFIAPI +InternalEmptyFunction ( + IN EFI_EVENT Event, + IN VOID *Context + ); + #endif diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c index 2f8b1807fd..1221403672 100644 --- a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c @@ -21,27 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "UefiLibInternal.h" -/** - An empty function to pass error checking of CreateEventEx (). - - This empty function ensures that EVT_NOTIFY_SIGNAL_ALL is error - checked correctly since it is now mapped into CreateEventEx() in UEFI 2.0. - - @param Event Event whose notification function is being invoked. - @param Context Pointer to the notification function's context, - which is implementation-dependent. - -**/ -VOID -EFIAPI -InternalEmptyFuntion ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - return; -} - /** Create a Legacy Boot Event. @@ -66,7 +45,7 @@ EfiCreateEventLegacyBoot ( { return EfiCreateEventLegacyBootEx ( TPL_CALLBACK, - InternalEmptyFuntion, + InternalEmptyFunction, NULL, LegacyBootEvent ); @@ -156,7 +135,7 @@ EfiCreateEventReadyToBoot ( { return EfiCreateEventReadyToBootEx ( TPL_CALLBACK, - InternalEmptyFuntion, + InternalEmptyFunction, NULL, ReadyToBootEvent );