From patchwork Tue Mar 22 17:21:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 64193 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2196367lbc; Tue, 22 Mar 2016 10:21:24 -0700 (PDT) X-Received: by 10.66.155.232 with SMTP id vz8mr55832252pab.53.1458667281734; Tue, 22 Mar 2016 10:21:21 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id 79si3521811pfo.227.2016.03.22.10.21.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Mar 2016 10:21:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CBB491A1FF4; Tue, 22 Mar 2016 10:21:44 -0700 (PDT) X-Original-To: edk2-devel@ml01.01.org Delivered-To: edk2-devel@ml01.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A6D2A1A1FF2 for ; Tue, 22 Mar 2016 10:21:43 -0700 (PDT) Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 55564821C3; Tue, 22 Mar 2016 17:21:19 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-74.phx2.redhat.com [10.3.113.74]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2MHLCE2000739; Tue, 22 Mar 2016 13:21:17 -0400 From: Laszlo Ersek To: edk2-devel@ml01.01.org Date: Tue, 22 Mar 2016 18:21:05 +0100 Message-Id: <1458667268-23242-4-git-send-email-lersek@redhat.com> In-Reply-To: <1458667268-23242-1-git-send-email-lersek@redhat.com> References: <1458667268-23242-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Subject: [edk2] [PATCH 3/6] IntelFrameworkPkg/FrameworkUefiLib: move InternalEmptyFunction to UefiLib.c X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Jordan Justen , Jeff Fan , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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 --- Notes: build tested only IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibInternal.h | 18 ++++++++++++++ IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c | 19 +++++++++++++++ IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c | 25 ++------------------ 3 files changed, 39 insertions(+), 23 deletions(-) -- 1.8.3.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibInternal.h b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLibInternal.h index e4bc433be47f..16c663626db2 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/UefiLib.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiLib.c index 554af2281e1c..9f73fb52eda6 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/UefiNotTiano.c b/IntelFrameworkPkg/Library/FrameworkUefiLib/UefiNotTiano.c index 2f8b1807fd2b..1221403672f9 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 );