summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2016-03-22 17:01:22 +0100
committerLaszlo Ersek <lersek@redhat.com>2016-03-23 12:05:42 +0100
commitff55dd3befb43cbbf6c69513eadada79c8e984f9 (patch)
tree10cb233e460d9042c760bb97f9a5d09a0d1d7d4c
parent772fb7cb13de5e18f04e8a19b97d2949f9dc7054 (diff)
downloadedk2-ff55dd3befb43cbbf6c69513eadada79c8e984f9.tar.gz
edk2-ff55dd3befb43cbbf6c69513eadada79c8e984f9.tar.bz2
edk2-ff55dd3befb43cbbf6c69513eadada79c8e984f9.zip
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 <michael.d.kinney@intel.com> Cc: Jeff Fan <jeff.fan@intel.com> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
-rw-r--r--IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c19
-rw-r--r--IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibInternal.h18
-rw-r--r--IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c25
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 <Library/PrintLib.h>
#include <Library/DevicePathLib.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
+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
@@ -22,27 +22,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.
Tiano extended the CreateEvent Type enum to add a legacy boot event type.
@@ -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
);